<!doctype html>
<html lang="ru" data-bs-theme="dark">

<head>
    <!-- 2024-05-11 14:16:43 -->
        <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>git merge</title>
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css" integrity="sha512-rO+olRTkcf304DQBxSWxln8JXCzTHlKnIdnMUwYvQa9/Jd4cQaNkItIUj6Z4nvW1dqK0SKXLbn9h4KwZTNtAyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/7.1.0/css/flag-icons.min.css" integrity="sha512-bZBu2H0+FGFz/stDN/L0k8J0G8qVsAL0ht1qg5kTwtAheiXwiRKyCq1frwfbSFSJN3jooR5kauE0YjtPzhZtJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link href="../../../runebook.css" rel="stylesheet" type="text/css">
    <meta name="x-github" content="https://github.com/runebookdev/runebook">
            <meta name="x-i18n-doc" content="git">
        <script>
        function i18n(element) {
            // NOP
        }
    </script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.js" integrity="sha512-F/dia2jKME12jwqiYDayeD+Rr/8jTWUD2wfbuJB0bzSwenSEnXsn4qQ/wVyXUCix5bmCAj8xJdtFr2OqUtjLAw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/rxjs/7.8.1/rxjs.umd.min.js" integrity="sha512-D9LDs8YUUVa4V9Gl4Zb+xqRAc7RCzooR3+zzebgK2RMu/KU+dh90pbjEEMzPiSyRSGbSp9j1pZnrO4joGa5WEg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js" integrity="sha512-mhbv5DqBMgrWL+32MmsDOt/OAvqr/cHimk6B8y/bx/xS88MVkYGPiVv2ixKVrkywF2qHplNRUvFsAHUdxZ3Krg==" crossorigin="anonymous"></script>
    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6424571640879890" crossorigin="anonymous"></script>    <script async src="https://www.googletagmanager.com/gtag/js?id=G-3G5BZ1QEDP"></script>
<script>
    window.dataLayer = window.dataLayer || [];

    function gtag() {
        dataLayer.push(arguments);
    }

    gtag('js', new Date());
    gtag('config', 'G-3G5BZ1QEDP');
</script>    <script>
(function(c, l, a, r, i, t, y) {
    c[a] = c[a] || function() {
        (c[a].q = c[a].q || []).push(arguments)
    };
    t = l.createElement(r);
    t.async = 1;
    t.src = "https://www.clarity.ms/tag/" + i + "?ref=bwt";
    y = l.getElementsByTagName(r)[0];
    y.parentNode.insertBefore(t, y);
})(window, document, "clarity", "script", "jto2hd94r9");
</script>    <script src="../../../theme.js"></script>
</head>

<body>
    <header class="bg-black">
        <div class="container">
            <div class="row">
                <div class="col">
                    <nav class="navbar navbar-expand-lg navbar-dark">
                        <a class="navbar-brand fw-bold" href="https://runebook.dev/ru">
                            <img alt="Runebook.dev" class="d-inline-block align-top mr-1" src="../../../assets/runebook_logo.webp" width="24" height="24">
                            Runebook.dev
                        </a>
                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                            <span class="navbar-toggler-icon"></span>
                        </button>
                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
                            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/ru#docs">Documentation</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/contributors">Contributors</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://github.com/runebookdev/runebook/issues">GitHub</a>
                                </li>
                            </ul>
                                                                                                <button class="btn btn-success ms-2" id="showPopupButton">
                                        <i class="bi bi-translate"></i>
                                        Show English
                                    </button>
                                                                                        <div class="form-check form-switch ms-3">
                                <label class="text-light">
                                    <input class="form-check-input" type="checkbox" role="switch" id="theme-switch" checked>
                                    <i class="bi bi-moon-stars-fill"></i>
                                </label>
                            </div>
                        </div>
                    </nav>
                </div>
            </div>
        </div>
    </header>

    <!--sse-->
    <div class="container">
    <div class="row">
        <div class="col">
            <nav aria-label="breadcrumb" class="mt-2">
                <ol class="breadcrumb mb-1">
                    <li class="breadcrumb-item">
                        <a href="https://runebook.dev/ru#docs">
                            <span class="fi fi-ru"></span>                            Русский                        </a>
                    </li>
                    <li class="breadcrumb-item">
                        <a href="-index-.html">
                            Git                            2.43                        </a>
                    </li>
                                            <li class="breadcrumb-item">
                            <a href="-index-.html#Branching_and_Merging">
                                Branching and Merging                            </a>
                        </li>
                                    </ol>
            </nav>
        </div>
    </div>
    <br>

    <div class="row">
        <div class="col-md-9">
            <main>
                <article>

                    
                    <h1 class="text-body-emphasis" ><span data-i18n="7dad2d1de04a1f8896e92d5e9d42f2fbc8aac988100edbc13d256500f57803fd/6e" data-source="git-merge" onmousemove="i18n(this)">git-merge</span></h1> <h2 class="text-body-emphasis"  id="_name"><span data-i18n="dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50/3a" data-source="Name" onmousemove="i18n(this)">Name</span></h2> <div> <p><span data-i18n="664aa3a6999be363cb745f412d3dea7e0e12335efd6c8c39c7235ced429f0dec/88" data-source="git-merge - Join two or more development histories together" onmousemove="i18n(this)">git-merge &mdash; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &dcy;&vcy;&iecy; &icy;&lcy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&icy; &vcy;&mcy;&iecy;&scy;&tcy;&iecy;</span></p> </div> <h2 class="text-body-emphasis"  id="_synopsis"><span data-i18n="8eb3755381519d7f0479d75446e56e20084834c0460d7ec94926932372ea6c47/0d" data-source="Synopsis" onmousemove="i18n(this)">Synopsis</span></h2> <div> <div> <pre class="hljs language-scss">git merge <span class="hljs-selector-attr">[-n]</span> <span class="hljs-selector-attr">[--stat]</span> <span class="hljs-selector-attr">[--no-commit]</span> <span class="hljs-selector-attr">[--squash]</span> <span class="hljs-selector-attr">[--[no-]</span>edit]
        <span class="hljs-selector-attr">[--no-verify]</span> <span class="hljs-selector-attr">[-s &lt;strategy&gt;]</span> <span class="hljs-selector-attr">[-X &lt;strategy-option&gt;]</span> <span class="hljs-selector-attr">[-S[&lt;keyid&gt;]</span>]
        <span class="hljs-selector-attr">[--[no-]</span>allow-unrelated-histories]
        <span class="hljs-selector-attr">[--[no-]</span>rerere-autoupdate] <span class="hljs-selector-attr">[-m &lt;msg&gt;]</span> <span class="hljs-selector-attr">[-F &lt;file&gt;]</span>
        <span class="hljs-selector-attr">[--into-name &lt;branch&gt;]</span> <span class="hljs-selector-attr">[&lt;commit&gt;&hellip;&ZeroWidthSpace;]</span>
git merge (--continue | --abort | --quit)</pre> </div> </div> <h2 class="text-body-emphasis"  id="_description"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h2> <div> <p><span data-i18n="daeaf85b3e6ee64a278ede0a1661a65428b295f55a1ea82d22b39c03a38a92fb/dc" data-source="Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by &lt;code&gt;git pull&lt;/code&gt; to incorporate changes from another repository and can be used by hand to merge changes from one branch into another." onmousemove="i18n(this)">&Vcy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&zcy; &icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy; (&scy; &mcy;&ocy;&mcy;&iecy;&ncy;&tcy;&acy;, &kcy;&ocy;&gcy;&dcy;&acy; &icy;&khcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy; &ocy;&tcy;&kcy;&lcy;&ocy;&ncy;&icy;&lcy;&acy;&scy;&softcy; &ocy;&tcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;) &vcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy;. &Ecy;&tcy;&acy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;  <code>git pull</code>  &dcy;&lcy;&yacy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yacy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &icy;&zcy; &dcy;&rcy;&ucy;&gcy;&ocy;&gcy;&ocy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy; &icy; &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy; &dcy;&lcy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &icy;&zcy; &ocy;&dcy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &vcy; &dcy;&rcy;&ucy;&gcy;&ucy;&yucy;.</span></p> <p><span data-i18n="a8efd008efed748dd54cb902a27e45ad47af1b49adf8c7ebcf8042f67e347dbd/d7" data-source="Assume the following history exists and the current branch is &lt;code&gt;master&lt;/code&gt;:" onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&ocy;&zhcy;&icy;&mcy;, &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&acy;&yacy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy; &icy; &tcy;&iecy;&kcy;&ucy;&shchcy;&acy;&yacy; &vcy;&iecy;&tcy;&kcy;&acy; &mdash;  <code>master</code> :</span></p> <div> <div> <pre class="hljs language-css">          <span class="hljs-selector-tag">A</span>-<span class="hljs-attr">--B---C</span> topic
         /
    D-<span class="hljs-attr">--E---F---G</span> master</pre> </div> </div> <p><span data-i18n="d160ae6662c8696a3b52fc63fa977b772b914728fb845e6178d4a491f1a5924e/78" data-source="Then &lt;code&gt;git merge topic&lt;/code&gt; will replay the changes made on the &lt;code&gt;topic&lt;/code&gt; branch since it diverged from &lt;code&gt;master&lt;/code&gt; (i.e., &lt;code&gt;E&lt;/code&gt;) until its current commit (&lt;code&gt;C&lt;/code&gt;) on top of &lt;code&gt;master&lt;/code&gt;, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes. Before the operation, &lt;code&gt;ORIG_HEAD&lt;/code&gt; is set to the tip of the current branch (&lt;code&gt;C&lt;/code&gt;)." onmousemove="i18n(this)">&Zcy;&acy;&tcy;&iecy;&mcy;  <code>git merge topic</code>  &vcy;&ocy;&scy;&pcy;&rcy;&ocy;&icy;&zcy;&vcy;&iecy;&dcy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy; &vcy;&iecy;&tcy;&kcy;&ucy;  <code>topic</code>  &scy; &mcy;&ocy;&mcy;&iecy;&ncy;&tcy;&acy; &iecy;&iecy; &rcy;&acy;&scy;&khcy;&ocy;&zhcy;&dcy;&iecy;&ncy;&icy;&yacy; &scy;  <code>master</code>  (&tcy;. &iecy;.  <code>E</code> ) &dcy;&ocy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; ( <code>C</code> ) &pcy;&ocy;&vcy;&iecy;&rcy;&khcy;  <code>master</code> , &icy; &zcy;&acy;&pcy;&icy;&shcy;&iecy;&tcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &vcy; &ncy;&ocy;&vcy;&ucy;&yucy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &vcy;&mcy;&iecy;&scy;&tcy;&iecy; &scy; &icy;&mcy;&iecy;&ncy;&acy;&mcy;&icy; &dcy;&vcy;&ucy;&khcy; &rcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;. &icy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &ocy;&tcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yacy;, &ocy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&yucy;&shchcy;&iecy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;. &Pcy;&iecy;&rcy;&iecy;&dcy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&iecy;&jcy;  <code>ORIG_HEAD</code>  &ucy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&acy; &kcy;&ocy;&ncy;&chcy;&icy;&kcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; ( <code>C</code> ).</span></p> <div> <div> <pre class="hljs language-css">          <span class="hljs-selector-tag">A</span>-<span class="hljs-attr">--B---C</span> topic
         /         \
    D-<span class="hljs-attr">--E---F---G---H</span> master</pre> </div> </div> <p><span data-i18n="ddbdaaa4474b7f455e37a7846aefebac1162cee04c484c853e8b37083c603486/01" data-source="A merge stops if there&amp;rsquo;s a conflict that cannot be resolved automatically or if &lt;code&gt;--no-commit&lt;/code&gt; was provided when initiating the merge. At that point you can run &lt;code&gt;git merge --abort&lt;/code&gt; or &lt;code&gt;git merge
--continue&lt;/code&gt;." onmousemove="i18n(this)">&Scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &pcy;&rcy;&iecy;&kcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy;&scy;&yacy;, &iecy;&scy;&lcy;&icy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&acy;&iecy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&iecy;&vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;, &icy;&lcy;&icy; &iecy;&scy;&lcy;&icy; &pcy;&rcy;&icy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &bcy;&ycy;&lcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;  <code>--no-commit</code> . &Ncy;&acy; &ecy;&tcy;&ocy;&mcy; &ecy;&tcy;&acy;&pcy;&iecy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&softcy;  <code>git merge --abort</code>  &icy;&lcy;&icy;  <code>git merge
--continue</code> .</span></p> <p><span data-i18n="e67c3d197a004da1ffde35521f2d1beff10eb4324a6186a667b0c336c2069b6d/5b" data-source="&lt;code&gt;git merge --abort&lt;/code&gt; will abort the merge process and try to reconstruct the pre-merge state. However, if there were uncommitted changes when the merge started (and especially if those changes were further modified after the merge was started), &lt;code&gt;git merge --abort&lt;/code&gt; will in some cases be unable to reconstruct the original (pre-merge) changes. Therefore:" onmousemove="i18n(this)"><code>git merge --abort</code>  &pcy;&rcy;&iecy;&rcy;&vcy;&iecy;&tcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&iecy; &dcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &iecy;&scy;&lcy;&icy; &ncy;&acy; &mcy;&ocy;&mcy;&iecy;&ncy;&tcy; &ncy;&acy;&chcy;&acy;&lcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &bcy;&ycy;&lcy;&icy; &ncy;&iecy;&zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; (&icy; &ocy;&scy;&ocy;&bcy;&iecy;&ncy;&ncy;&ocy; &iecy;&scy;&lcy;&icy; &ecy;&tcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &bcy;&ycy;&lcy;&icy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&ycy; &pcy;&ocy;&scy;&lcy;&iecy; &ncy;&acy;&chcy;&acy;&lcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;),  <code>git merge --abort</code>  &vcy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &scy;&lcy;&ucy;&chcy;&acy;&yacy;&khcy; &ncy;&iecy; &scy;&mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; (&dcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;). &Pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy;:</span></p> <p><span data-i18n="fb78dcf04e63bbe0e4873e3bb66c6cad770f855fb9b455aa2b1ca8bacfe8a36d/dc" data-source="&lt;strong&gt;Warning&lt;/strong&gt;: Running &lt;code&gt;git merge&lt;/code&gt; with non-trivial uncommitted changes is discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&dcy;&ucy;&pcy;&rcy;&iecy;&zhcy;&dcy;&iecy;&ncy;&icy;&iecy;. &Zcy;&acy;&pcy;&ucy;&scy;&kcy;  <code>git merge</code>  &scy; &ncy;&iecy;&tcy;&rcy;&icy;&vcy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&mcy;&icy; &ncy;&iecy;&zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&mcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;&mcy;&icy; &ncy;&iecy; &rcy;&iecy;&kcy;&ocy;&mcy;&iecy;&ncy;&dcy;&ucy;&iecy;&tcy;&scy;&yacy;: &khcy;&ocy;&tcy;&yacy; &ecy;&tcy;&ocy; &icy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&softcy; &vcy;&acy;&scy; &vcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&icy;, &icy;&zcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&gcy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &tcy;&rcy;&ucy;&dcy;&ncy;&ocy; &vcy;&ycy;&jcy;&tcy;&icy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_options"><span data-i18n="d0db8b5e364b6989e4b8f38a2b3846b87d99a51c1592ebf35d21cc66405a8e39/b6" data-source="Options" onmousemove="i18n(this)">Options</span></h2> <div> <div> <dl> <dt id="Documentation/git-merge.txt---commit"><span data-i18n="0c2b61497c648cc96d11e504a9e82abf5721d31c0c4364edc3534f2cf72fea9f/de" data-source="--commit" onmousemove="i18n(this)">--commit</span></dt> <dt id="Documentation/git-merge.txt---no-commit"><span data-i18n="9b9cdda0ab6238702817cce7bcef8e46569714f6e6c2c84eac494be486ce2c24/0b" data-source="--no-commit" onmousemove="i18n(this)">--no-commit</span></dt> <dd> <p><span data-i18n="ee957ebd8491d33cc898e4835fe876528c2bc2f6a5a124066fdf95144b3ae4a7/be" data-source="Perform the merge and commit the result. This option can be used to override --no-commit." onmousemove="i18n(this)">&Vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &icy; &zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ucy;&jcy;&tcy;&iecy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;. &Ecy;&tcy;&ucy; &ocy;&pcy;&tscy;&icy;&yucy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; --no-commit.</span></p> <p><span data-i18n="2dee7cbab32ebda1a4441a667e8e186be0f1931dd022618357480c76476cec99/75" data-source="With --no-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing." onmousemove="i18n(this)">&Scy; --no-commit &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &icy; &ocy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&iecy; &iecy;&gcy;&ocy; &ncy;&iecy;&pcy;&ocy;&scy;&rcy;&iecy;&dcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy; &pcy;&iecy;&rcy;&iecy;&dcy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&iecy;&mcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &chcy;&tcy;&ocy;&bcy;&ycy; &dcy;&acy;&tcy;&softcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&icy;&tcy;&softcy; &icy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&dcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&iecy;&jcy;.</span></p> <p><span data-i18n="ac5efc0098fa2add33c7ee85e489b611372e8029e3c01158269afe562d1674e9/de" data-source="Note that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit. Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &ucy;&scy;&kcy;&ocy;&rcy;&iecy;&ncy;&ncy;&ycy;&iecy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &ncy;&iecy; &scy;&ocy;&zcy;&dcy;&acy;&yucy;&tcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &icy; &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &ncy;&iecy;&vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy; &ocy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &ecy;&tcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; --no-commit. &Tcy;&acy;&kcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &gcy;&acy;&rcy;&acy;&ncy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;, &chcy;&tcy;&ocy; &vcy;&acy;&shcy;&acy; &vcy;&iecy;&tcy;&kcy;&acy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&acy; &icy;&lcy;&icy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&acy; &ZeroWidthSpace;&ZeroWidthSpace;&kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ocy;&jcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; --no-ff &scy; --no-commit.</span></p> </dd> <dt id="Documentation/git-merge.txt---edit"><span data-i18n="cc5742b084b508c13441caade319afc12636c48b1bca9711e824e9997befc99b/d9" data-source="--edit" onmousemove="i18n(this)">--edit</span></dt> <dt id="Documentation/git-merge.txt--e"><span data-i18n="44d2846e091eb9e7b6ac807e4d426fc83e819cec5681288eb3696a5c0e3d3678/84" data-source="-e" onmousemove="i18n(this)">-e</span></dt> <dt id="Documentation/git-merge.txt---no-edit"><span data-i18n="cc70d86c9543bdf1e051d41cbe3306912e8c1b6beb16fd96ba780a0ea6d4e1e0/1d" data-source="--no-edit" onmousemove="i18n(this)">--no-edit</span></dt> <dd> <p><span data-i18n="ca3bc51637f69b423e48170073fa599b04c299876eeb3f984c72e89d04ee2a91/d8" data-source="Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The &lt;code&gt;--no-edit&lt;/code&gt; option can be used to accept the auto-generated message (this is generally discouraged). The &lt;code&gt;--edit&lt;/code&gt; (or &lt;code&gt;-e&lt;/code&gt;) option is still useful if you are giving a draft message with the &lt;code&gt;-m&lt;/code&gt; option from the command line and want to edit it in the editor." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&iecy;&mcy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&gcy;&ocy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&ycy;&zcy;&ocy;&vcy;&icy;&tcy;&iecy; &rcy;&iecy;&dcy;&acy;&kcy;&tcy;&ocy;&rcy; &dcy;&lcy;&yacy; &dcy;&acy;&lcy;&softcy;&ncy;&iecy;&jcy;&shcy;&iecy;&gcy;&ocy; &rcy;&iecy;&dcy;&acy;&kcy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy; &mcy;&ocy;&gcy; &ocy;&bcy;&hardcy;&yacy;&scy;&ncy;&icy;&tcy;&softcy; &icy; &ocy;&bcy;&ocy;&scy;&ncy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;. &Ocy;&pcy;&tscy;&icy;&yucy;  <code>--no-edit</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &pcy;&rcy;&icy;&iecy;&mcy;&acy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &scy;&gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; (&ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ecy;&tcy;&ocy; &ncy;&iecy; &rcy;&iecy;&kcy;&ocy;&mcy;&iecy;&ncy;&dcy;&ucy;&iecy;&tcy;&scy;&yacy;). &Pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;  <code>--edit</code>  (&icy;&lcy;&icy;  <code>-e</code> ) &pcy;&ocy;-&pcy;&rcy;&iecy;&zhcy;&ncy;&iecy;&mcy;&ucy; &pcy;&ocy;&lcy;&iecy;&zcy;&iecy;&ncy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;&iecy; &chcy;&iecy;&rcy;&ncy;&ocy;&vcy;&icy;&kcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &scy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ocy;&mcy;  <code>-m</code>  &icy;&zcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &icy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &ocy;&tcy;&rcy;&iecy;&dcy;&acy;&kcy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &iecy;&gcy;&ocy; &vcy; &rcy;&iecy;&dcy;&acy;&kcy;&tcy;&ocy;&rcy;&iecy;.</span></p> <p><span data-i18n="0fa4be0cc62698ea010880c45bb26303d9b4a1e3d84db469808e64dc6517cac7/42" data-source="Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run &lt;code&gt;git merge&lt;/code&gt;. To make it easier to adjust such scripts to the updated behaviour, the environment variable &lt;code&gt;GIT_MERGE_AUTOEDIT&lt;/code&gt; can be set to &lt;code&gt;no&lt;/code&gt; at the beginning of them." onmousemove="i18n(this)">&Scy;&tcy;&acy;&rcy;&ycy;&iecy; &scy;&tscy;&iecy;&ncy;&acy;&rcy;&icy;&icy; &mcy;&ocy;&gcy;&ucy;&tcy; &zcy;&acy;&vcy;&icy;&scy;&iecy;&tcy;&softcy; &ocy;&tcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&gcy;&ocy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&yacy;, &zcy;&acy;&pcy;&rcy;&iecy;&shchcy;&acy;&yucy;&shchcy;&iecy;&gcy;&ocy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &rcy;&iecy;&dcy;&acy;&kcy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ocy;&ncy;&icy; &ucy;&vcy;&icy;&dcy;&yacy;&tcy; &ocy;&tcy;&kcy;&rcy;&ycy;&tcy;&ycy;&jcy; &rcy;&iecy;&dcy;&acy;&kcy;&tcy;&ocy;&rcy; &pcy;&rcy;&icy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&iecy;  <code>git merge</code> . &CHcy;&tcy;&ocy;&bcy;&ycy; &ucy;&pcy;&rcy;&ocy;&scy;&tcy;&icy;&tcy;&softcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&ucy; &tcy;&acy;&kcy;&icy;&khcy; &scy;&tscy;&iecy;&ncy;&acy;&rcy;&icy;&iecy;&vcy; &ncy;&acy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ncy;&ocy;&iecy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&iecy;, &vcy; &icy;&khcy; &ncy;&acy;&chcy;&acy;&lcy;&iecy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &scy;&rcy;&iecy;&dcy;&ycy;  <code>GIT_MERGE_AUTOEDIT</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>no</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt---cleanupltmodegt"><span data-i18n="5c5c7a37707f096405160705e708cfc6e08b4a3726d31ed1fe15b624620edb50/1d" data-source="--cleanup=&amp;lt;mode&amp;gt;" onmousemove="i18n(this)">--cleanup=&lt;mode&gt;</span></dt> <dd> <p><span data-i18n="e1f6fd441ba5b38b014f30b3bb9de4e5759b278e648ae19643ec495bc536041d/02" data-source="This option determines how the merge message will be cleaned up before committing. See &lt;a href=&quot;git-commit&quot;&gt;git-commit[1]&lt;/a&gt; for more details. In addition, if the &lt;code&gt;&amp;lt;mode&amp;gt;&lt;/code&gt; is given a value of &lt;code&gt;scissors&lt;/code&gt;, scissors will be appended to &lt;code&gt;MERGE_MSG&lt;/code&gt; before being passed on to the commit machinery in the case of a merge conflict." onmousemove="i18n(this)">&Ecy;&tcy;&acy; &ocy;&pcy;&tscy;&icy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy;, &kcy;&acy;&kcy; &bcy;&ucy;&dcy;&iecy;&tcy; &ocy;&chcy;&icy;&shchcy;&iecy;&ncy;&ocy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&iecy;&jcy;. &Dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy; &scy;&mcy;. &vcy;  <a href="git-commit.html">git-commit[1]</a> . &Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &iecy;&scy;&lcy;&icy;  <code>&lt;mode&gt;</code>  &pcy;&rcy;&icy;&scy;&vcy;&ocy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>scissors</code>  , &ncy;&ocy;&zhcy;&ncy;&icy;&tscy;&ycy; &bcy;&ucy;&dcy;&ucy;&tcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&ycy; &kcy;  <code>MERGE_MSG</code>  &pcy;&iecy;&rcy;&iecy;&dcy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&chcy;&iecy;&jcy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy;&ucy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---ff"><span data-i18n="6debba909e038c0c6dc089be0bce24a7057e8747e67635053370e59d35a415d5/cd" data-source="--ff" onmousemove="i18n(this)">--ff</span></dt> <dt id="Documentation/git-merge.txt---no-ff"><span data-i18n="1210d1f00f18f67d5cfcac990e97c59607c17263bcb8de413896c311476eddd0/3e" data-source="--no-ff" onmousemove="i18n(this)">--no-ff</span></dt> <dt id="Documentation/git-merge.txt---ff-only"><span data-i18n="a6bb09f86f21792c9c9075c2d5cfb54bd345edcfadda5d89fd4373fb8d0dc94d/ac" data-source="--ff-only" onmousemove="i18n(this)">--ff-only</span></dt> <dd> <p><span data-i18n="3610cb5e2f52aba3eec0b35b8abbe634838a0a4187d82ab7ff93b62e608867c2/74" data-source="Specifies how a merge is handled when the merged-in history is already a descendant of the current history. &lt;code&gt;--ff&lt;/code&gt; is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the &lt;code&gt;refs/tags/&lt;/code&gt; hierarchy, in which case &lt;code&gt;--no-ff&lt;/code&gt; is assumed." onmousemove="i18n(this)">&Ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;, &kcy;&acy;&kcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &iecy;&scy;&lcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&acy;&yacy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy; &ucy;&zhcy;&iecy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy;&tcy;&ocy;&mcy;&kcy;&ocy;&mcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;.  <code>--ff</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;, &iecy;&scy;&lcy;&icy; &ncy;&iecy; &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&dcy;&icy;&tcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&iecy; &acy;&ncy;&ncy;&ocy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; (&icy;, &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &pcy;&ocy;&dcy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy;) &tcy;&iecy;&gcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&iecy; &khcy;&rcy;&acy;&ncy;&icy;&tcy;&scy;&yacy; &ncy;&acy; &scy;&vcy;&ocy;&iecy;&mcy; &iecy;&scy;&tcy;&iecy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy;&mcy; &mcy;&iecy;&scy;&tcy;&iecy; &vcy; &icy;&iecy;&rcy;&acy;&rcy;&khcy;&icy;&icy;  <code>refs/tags/</code> , &icy; &vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&iecy;&tcy;&scy;&yacy;  <code>--no-ff</code> .</span></p> <p><span data-i18n="8749d7062095d6ab7adbd62b19becf7c46fc4ec8126ad97d0d945b5a663d3b75/b2" data-source="With &lt;code&gt;--ff&lt;/code&gt;, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit." onmousemove="i18n(this)">&Scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>--ff</code>  &pcy;&ocy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&jcy;&tcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &kcy;&acy;&kcy; &ucy;&scy;&kcy;&ocy;&rcy;&iecy;&ncy;&ncy;&ucy;&yucy; &pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&kcy;&ucy; &vcy;&pcy;&iecy;&rcy;&iecy;&dcy; (&ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&yacy;&jcy;&tcy;&iecy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy; &vcy;&iecy;&tcy;&kcy;&icy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&ncy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&lcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&iecy;; &ncy;&iecy; &scy;&ocy;&zcy;&dcy;&acy;&vcy;&acy;&jcy;&tcy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;). &IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy; &ncy;&iecy;&vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy; (&kcy;&ocy;&gcy;&dcy;&acy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&acy;&yacy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy; &ncy;&iecy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy;&tcy;&ocy;&mcy;&kcy;&ocy;&mcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;), &scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="fb82564b656142bccebb28f1af3818034e2ca68099399c46e6aca700def45cac/cd" data-source="With &lt;code&gt;--no-ff&lt;/code&gt;, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward." onmousemove="i18n(this)">&Scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>--no-ff</code>  &scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&ocy; &vcy;&scy;&iecy;&khcy; &scy;&lcy;&ucy;&chcy;&acy;&yacy;&khcy;, &dcy;&acy;&zhcy;&iecy; &iecy;&scy;&lcy;&icy; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ycy;&lcy;&ocy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &kcy;&acy;&kcy; &ucy;&scy;&kcy;&ocy;&rcy;&iecy;&ncy;&ncy;&ucy;&yucy; &pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&kcy;&ucy; &vcy;&pcy;&iecy;&rcy;&iecy;&dcy;.</span></p> <p><span data-i18n="d57023e42c8209a9757079182649e372d394004ce6ad4ef73b6367066f27c49d/4a" data-source="With &lt;code&gt;--ff-only&lt;/code&gt;, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status." onmousemove="i18n(this)">&Scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>--ff-only</code>  &pcy;&ocy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&jcy;&tcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &kcy;&acy;&kcy; &ucy;&scy;&kcy;&ocy;&rcy;&iecy;&ncy;&ncy;&ucy;&yucy; &pcy;&iecy;&rcy;&iecy;&mcy;&ocy;&tcy;&kcy;&ucy; &vcy;&pcy;&iecy;&rcy;&iecy;&dcy;. &IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy; &ncy;&iecy;&vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &ocy;&tcy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy;&scy;&softcy; &ocy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &vcy;&ycy;&jcy;&dcy;&icy;&tcy;&iecy; &scy; &ncy;&iecy;&ncy;&ucy;&lcy;&iecy;&vcy;&ycy;&mcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt--Sltkeyidgt"><span data-i18n="81022e0227a476cb39b3c7536e8861d916ea9462349bdbb91fe1f1ee856622ff/ad" data-source="-S[&amp;lt;keyid&amp;gt;]" onmousemove="i18n(this)">-S[&lt;keyid&gt;]</span></dt> <dt id="Documentation/git-merge.txt---gpg-signltkeyidgt"><span data-i18n="df48474147c9c7172d8f1029beb425f8566e8a840580f02b664cfd0a332db8e6/2e" data-source="--gpg-sign[=&amp;lt;keyid&amp;gt;]" onmousemove="i18n(this)">--gpg-sign[=&lt;keyid&gt;]</span></dt> <dt id="Documentation/git-merge.txt---no-gpg-sign"><span data-i18n="08f741608de1fc2eb2af984114e38f3f6852b5d615634c4e27dffda230a0220e/ee" data-source="--no-gpg-sign" onmousemove="i18n(this)">--no-gpg-sign</span></dt> <dd> <p><span data-i18n="1c57d851ece23703a3565e11989c713444524c7637eb0defc09fd098181a568e/f3" data-source="GPG-sign the resulting merge commit. The &lt;code&gt;keyid&lt;/code&gt; argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. &lt;code&gt;--no-gpg-sign&lt;/code&gt; is useful to countermand both &lt;code&gt;commit.gpgSign&lt;/code&gt; configuration variable, and earlier &lt;code&gt;--gpg-sign&lt;/code&gt;." onmousemove="i18n(this)">&Pcy;&ocy;&dcy;&pcy;&icy;&shcy;&icy;&tcy;&iecy; GPG &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&ncy;&ycy;&jcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;  <code>keyid</code>  &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &ncy;&iecy;&ocy;&bcy;&yacy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy; &icy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &icy;&dcy;&iecy;&ncy;&tcy;&icy;&fcy;&icy;&kcy;&acy;&tcy;&ocy;&rcy;&ucy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy;; &iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ocy;, &ocy;&ncy;&ocy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ocy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&icy;&kcy;&rcy;&iecy;&pcy;&lcy;&iecy;&ncy;&ocy; &kcy; &ocy;&pcy;&tscy;&icy;&icy; &bcy;&iecy;&zcy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&acy;.  <code>--no-gpg-sign</code>  &pcy;&ocy;&lcy;&iecy;&zcy;&iecy;&ncy; &dcy;&lcy;&yacy; &ocy;&tcy;&mcy;&iecy;&ncy;&ycy; &kcy;&acy;&kcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>commit.gpgSign</code> , &tcy;&acy;&kcy; &icy; &bcy;&ocy;&lcy;&iecy;&iecy; &rcy;&acy;&ncy;&ncy;&iecy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy;  <code>--gpg-sign</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt---logltngt"><span data-i18n="2e3ee40df75c852e4f7d7adde446bf29714c5b4a550cef38076dd188e39f7bd4/77" data-source="--log[=&amp;lt;n&amp;gt;]" onmousemove="i18n(this)">--log[=&lt;n&gt;]</span></dt> <dt id="Documentation/git-merge.txt---no-log"><span data-i18n="4e7d3507e392f030f39abca787a74ded49d531fca78aaeff179b1731db7ef6b4/c5" data-source="--no-log" onmousemove="i18n(this)">--no-log</span></dt> <dd> <p><span data-i18n="985a42c1db8655a28dabf67cb44b1b1431a9e9a75cc211619903e27c1dd12f68/95" data-source="In addition to branch names, populate the log message with one-line descriptions from at most &amp;lt;n&amp;gt; actual commits that are being merged. See also &lt;a href=&quot;git-fmt-merge-msg&quot;&gt;git-fmt-merge-msg[1]&lt;/a&gt;." onmousemove="i18n(this)">&Pcy;&ocy;&mcy;&icy;&mcy;&ocy; &ncy;&acy;&zcy;&vcy;&acy;&ncy;&icy;&jcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;, &zcy;&acy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &ocy;&dcy;&ncy;&ocy;&scy;&tcy;&rcy;&ocy;&chcy;&ncy;&ycy;&mcy;&icy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&icy;&yacy;&mcy;&icy; &ncy;&iecy; &bcy;&ocy;&lcy;&iecy;&iecy; &chcy;&iecy;&mcy; &icy;&zcy; &lt;n&gt; &fcy;&acy;&kcy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&yucy;&tcy;&scy;&yacy;. &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="git-fmt-merge-msg.html">git-fmt-merge-msg[1]</a> .</span></p> <p><span data-i18n="5e07907d3fe0bbf35f2a9ddc18eae01bc09b019593b38cb5310f450fefae97da/13" data-source="With --no-log do not list one-line descriptions from the actual commits being merged." onmousemove="i18n(this)">&Scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; --no-log &ncy;&iecy; &pcy;&iecy;&rcy;&iecy;&chcy;&icy;&scy;&lcy;&yacy;&jcy;&tcy;&iecy; &ocy;&dcy;&ncy;&ocy;&scy;&tcy;&rcy;&ocy;&chcy;&ncy;&ycy;&iecy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&icy;&yacy; &fcy;&acy;&kcy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ycy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---signoff"><span data-i18n="8deeb9c823dc56953005eef28f08e1ae8e950a5ddcdf5af3be9c52d2b23e5e32/fa" data-source="--signoff" onmousemove="i18n(this)">--signoff</span></dt> <dt id="Documentation/git-merge.txt---no-signoff"><span data-i18n="e28634d1b35ed269a7031bb1c78fdf34a07f032e34f2130c47235372a7e2e236/4d" data-source="--no-signoff" onmousemove="i18n(this)">--no-signoff</span></dt> <dd> <p><span data-i18n="f275729e327963dd4f928998cc9b6b20be338af2ad8ac57489808d464c798050/06" data-source="Add a &lt;code&gt;Signed-off-by&lt;/code&gt; trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you&amp;rsquo;re committing. For example, it may certify that the committer has the rights to submit the work under the project&amp;rsquo;s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See &lt;a href=&quot;https://developercertificate.org&quot;&gt;https://developercertificate.org&lt;/a&gt; for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you&amp;rsquo;re contributing to understand how the signoffs are used in that project." onmousemove="i18n(this)">&Dcy;&ocy;&bcy;&acy;&vcy;&softcy;&tcy;&iecy; &tcy;&rcy;&iecy;&jcy;&lcy;&iecy;&rcy;  <code>Signed-off-by</code>  &ocy;&tcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;. &Zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&acy;&ncy;&icy;&yacy; &zcy;&acy;&vcy;&icy;&scy;&icy;&tcy; &ocy;&tcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&acy;, &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &vcy;&ycy; &bcy;&iecy;&rcy;&iecy;&tcy;&iecy;&scy;&softcy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &ocy;&ncy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ucy;&dcy;&ocy;&scy;&tcy;&ocy;&vcy;&iecy;&rcy;&icy;&tcy;&softcy;, &chcy;&tcy;&ocy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy; &icy;&mcy;&iecy;&iecy;&tcy; &pcy;&rcy;&acy;&vcy;&acy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&softcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &pcy;&ocy; &lcy;&icy;&tscy;&iecy;&ncy;&zcy;&icy;&icy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&acy; &icy;&lcy;&icy; &scy;&ocy;&gcy;&lcy;&acy;&scy;&iecy;&ncy; &ncy;&acy; &kcy;&acy;&kcy;&ocy;&iecy;-&lcy;&icy;&bcy;&ocy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &ucy;&chcy;&acy;&scy;&tcy;&ncy;&icy;&kcy;&acy;, &tcy;&acy;&kcy;&ocy;&iecy; &kcy;&acy;&kcy; &Scy;&iecy;&rcy;&tcy;&icy;&fcy;&icy;&kcy;&acy;&tcy; &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&zhcy;&dcy;&iecy;&ncy;&icy;&yacy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&chcy;&icy;&kcy;&acy;. (&Scy;&mcy;.  <a href="https://developercertificate.org">https://developercertificate.org</a> , &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &yacy;&dcy;&rcy;&iecy; Linux &icy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&acy;&khcy;  Git .) &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy;&scy;&softcy; &kcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&icy; &icy;&lcy;&icy; &rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&scy;&tcy;&vcy;&ucy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&acy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &vcy;&ycy; &vcy;&ncy;&ocy;&scy;&icy;&tcy;&iecy; &scy;&vcy;&ocy;&jcy; &vcy;&kcy;&lcy;&acy;&dcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&ocy;&ncy;&yacy;&tcy;&softcy;, &kcy;&acy;&kcy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yucy;&tcy;&scy;&yacy; &vcy; &ecy;&tcy;&ocy;&mcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&iecy;.</span></p> <p><span data-i18n="707f110023a56a6de89a7a6b755d144a566844219f535d28bf222c96f8c7618a/f3" data-source="The --no-signoff option can be used to countermand an earlier --signoff option on the command line." onmousemove="i18n(this)">&Ocy;&pcy;&tscy;&icy;&yucy; --no-signoff &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &ocy;&tcy;&mcy;&iecy;&ncy;&ycy; &bcy;&ocy;&lcy;&iecy;&iecy; &rcy;&acy;&ncy;&ncy;&iecy;&jcy; &ocy;&pcy;&tscy;&icy;&icy; --signoff &vcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---stat"><span data-i18n="dcbfcaf7e3d31dca78e7804434254ee54852a4f6b5f54f3adcfdb3955f6f768e/5f" data-source="--stat" onmousemove="i18n(this)">--stat</span></dt> <dt id="Documentation/git-merge.txt--n"><span data-i18n="5249f4fcc629efa0e6d6b2bf746b6c5de61611ce719ad61ac820fbe5c8cece66/28" data-source="-n" onmousemove="i18n(this)">-n</span></dt> <dt id="Documentation/git-merge.txt---no-stat"><span data-i18n="019cd7ab64d03694da72ac9ebba8f308d25389952e31a2b7dd9de1f545c4b7bd/3a" data-source="--no-stat" onmousemove="i18n(this)">--no-stat</span></dt> <dd> <p><span data-i18n="6a58d277129886f360bf35e4e6831a8e9e75fa7702e12f588c94840aae809596/cf" data-source="Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat." onmousemove="i18n(this)">&Pcy;&ocy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; diffstat &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. diffstat &tcy;&acy;&kcy;&zhcy;&iecy; &kcy;&ocy;&ncy;&tcy;&rcy;&ocy;&lcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ocy;&mcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; merge.stat.</span></p> <p><span data-i18n="eb29a8fbb7e97aa324782b45c5120fcee364e23ec559dc602c4038f9472b07fe/80" data-source="With -n or --no-stat do not show a diffstat at the end of the merge." onmousemove="i18n(this)">&Scy; -n &icy;&lcy;&icy; --no-stat &ncy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy; &scy;&tcy;&acy;&tcy;&icy;&scy;&tcy;&icy;&kcy;&ucy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---squash"><span data-i18n="a09e0ec33bc416823ad3ea1d6c1c2753c9f8ca6f4c46c41e28c2bfdf25f65a2e/da" data-source="--squash" onmousemove="i18n(this)">--squash</span></dt> <dt id="Documentation/git-merge.txt---no-squash"><span data-i18n="5f40a6a0d834379adbedddec08a87a1162565c6122b704566d45e2222884a9b3/4e" data-source="--no-squash" onmousemove="i18n(this)">--no-squash</span></dt> <dd> <p><span data-i18n="b6773b632918b0d61a70682232e38e031cf11e66362daf7be9ca941cecdae308/e3" data-source="Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the &lt;code&gt;HEAD&lt;/code&gt;, or record &lt;code&gt;$GIT_DIR/MERGE_HEAD&lt;/code&gt; (to cause the next &lt;code&gt;git commit&lt;/code&gt; command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)." onmousemove="i18n(this)">&Scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &icy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&iecy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&acy;, &kcy;&acy;&kcy; &iecy;&scy;&lcy;&icy; &bcy;&ycy; &pcy;&rcy;&ocy;&icy;&zcy;&ocy;&shcy;&lcy;&ocy; &rcy;&iecy;&acy;&lcy;&softcy;&ncy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; (&zcy;&acy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; &ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy;), &ncy;&ocy; &ncy;&acy; &scy;&acy;&mcy;&ocy;&mcy; &dcy;&iecy;&lcy;&iecy; &ncy;&iecy; &dcy;&iecy;&lcy;&acy;&jcy;&tcy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy;, &ncy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&shchcy;&acy;&jcy;&tcy;&iecy;  <code>HEAD</code>  &icy; &ncy;&iecy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&jcy;&tcy;&iecy;  <code>$GIT_DIR/MERGE_HEAD</code>  (&chcy;&tcy;&ocy;&bcy;&ycy; &zcy;&acy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&softcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&ucy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy;  <code>git commit</code>  &scy;&ocy;&zcy;&dcy;&acy;&tcy;&softcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;). &Ecy;&tcy;&ocy; &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &vcy;&acy;&mcy; &scy;&ocy;&zcy;&dcy;&acy;&tcy;&softcy; &ocy;&dcy;&icy;&ncy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy; &pcy;&ocy;&vcy;&iecy;&rcy;&khcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;, &ecy;&fcy;&fcy;&iecy;&kcy;&tcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&gcy;&ocy; &acy;&ncy;&acy;&lcy;&ocy;&gcy;&icy;&chcy;&iecy;&ncy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yucy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; (&icy;&lcy;&icy; &bcy;&ocy;&lcy;&softcy;&shcy;&iecy;&gcy;&ocy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&acy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &ocy;&scy;&softcy;&mcy;&icy;&ncy;&ocy;&gcy;&acy;).</span></p> <p><span data-i18n="eccff8458449333c1cc74c41f6a6d39d9c0a72b22ba0535ba775ad088aecb0b0/27" data-source="With --no-squash perform the merge and commit the result. This option can be used to override --squash." onmousemove="i18n(this)">&Scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; --no-squash &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &icy; &zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ucy;&jcy;&tcy;&iecy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;. &Ecy;&tcy;&ucy; &ocy;&pcy;&tscy;&icy;&yucy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; --squash.</span></p> <p><span data-i18n="aeef7a5b7bf086f6280baa108e72baa1ba295a0a506e244749039ade4dc0de2d/2c" data-source="With --squash, --commit is not allowed, and will fail." onmousemove="i18n(this)">&Scy; --squash --commit &ncy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy; &icy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy;&scy;&yacy; &ocy;&shcy;&icy;&bcy;&kcy;&ocy;&jcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---no-verify"><span data-i18n="f1973c1e7d01cc1bccc3d12bfad39d7bdbd324bb1b82ca8d3207f26045c09a2a/02" data-source="--[no-]verify" onmousemove="i18n(this)">--[no-]verify</span></dt> <dd> <p><span data-i18n="ee397ac9100f49357a31fa88ea487b0a4497527a94445e8724f9b2d50f92814d/56" data-source="By default, the pre-merge and commit-msg hooks are run. When &lt;code&gt;--no-verify&lt;/code&gt; is given, these are bypassed. See also &lt;a href=&quot;githooks&quot;&gt;githooks[5]&lt;/a&gt;." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&yucy;&tcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&khcy;&vcy;&acy;&tcy;&chcy;&icy;&kcy;&icy; pre-merge &icy; commit-msg. &Kcy;&ocy;&gcy;&dcy;&acy; &zcy;&acy;&dcy;&acy;&ncy;  <code>--no-verify</code> , &ocy;&ncy;&icy; &ocy;&bcy;&khcy;&ocy;&dcy;&yacy;&tcy;&scy;&yacy;. &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="githooks.html">githooks[5]</a> .</span></p> </dd> <dt id="Documentation/git-merge.txt--sltstrategygt"><span data-i18n="ac5ae1629a39c2f9f8ef746a8c38bc0f7535614deb96c6197e1e8ffe02acbc4e/c3" data-source="-s &amp;lt;strategy&amp;gt;" onmousemove="i18n(this)">-s &lt;strategy&gt;</span></dt> <dt id="Documentation/git-merge.txt---strategyltstrategygt"><span data-i18n="d59ee41a7fbb46b68cbf62188c2b07682e9a907bb7606d1c90992296bfb8adc7/ef" data-source="--strategy=&amp;lt;strategy&amp;gt;" onmousemove="i18n(this)">--strategy=&lt;strategy&gt;</span></dt> <dd> <p><span data-i18n="5cf9fc7247b28bccc91793b100dfdcf68ae49c003bcc1e5e6e662f0956cf0d47/98" data-source="Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no &lt;code&gt;-s&lt;/code&gt; option, a built-in list of strategies is used instead (&lt;code&gt;ort&lt;/code&gt; when merging a single head, &lt;code&gt;octopus&lt;/code&gt; otherwise)." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &dcy;&acy;&ncy;&ncy;&ucy;&yucy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&ycy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &rcy;&acy;&zcy;&acy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &icy;&khcy; &vcy; &tcy;&ocy;&mcy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&iecy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &ocy;&ncy;&icy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &ocy;&pcy;&rcy;&ocy;&bcy;&ocy;&vcy;&acy;&ncy;&ycy;. &IEcy;&scy;&lcy;&icy; &ocy;&pcy;&tscy;&icy;&yacy;  <code>-s</code>  &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy;, &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ncy;&iecy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&jcy; ( <code>ort</code>  &pcy;&rcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy; &ocy;&dcy;&ncy;&ocy;&jcy; &gcy;&ocy;&lcy;&ocy;&vcy;&ycy;,  <code>octopus</code>  &vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;).</span></p> </dd> <dt id="Documentation/git-merge.txt--Xltoptiongt"><span data-i18n="eb1d652103920c194523d44295756c74e07a6d393c1a3f43aafd15ce0de95bf2/0f" data-source="-X &amp;lt;option&amp;gt;" onmousemove="i18n(this)">-X &lt;option&gt;</span></dt> <dt id="Documentation/git-merge.txt---strategy-optionltoptiongt"><span data-i18n="e47d551fb0c5511482ebe96bc5a802666661f0026af76682c0554939019c81b0/13" data-source="--strategy-option=&amp;lt;option&amp;gt;" onmousemove="i18n(this)">--strategy-option=&lt;option&gt;</span></dt> <dd> <p><span data-i18n="eec6ef21ce778f9109fb8c40ecf4af73ea35af231f0bfec5ffdb347f38576bb2/d8" data-source="Pass merge strategy specific option through to the merge strategy." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy;&acy;&jcy;&tcy;&iecy; &kcy;&ocy;&ncy;&kcy;&rcy;&iecy;&tcy;&ncy;&ucy;&yucy; &ocy;&pcy;&tscy;&icy;&yucy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---verify-signatures"><span data-i18n="2358545beff2b5f676a89969349d356eb09a41bc9f22e55bb03a0da6c3da9ecb/83" data-source="--verify-signatures" onmousemove="i18n(this)">--verify-signatures</span></dt> <dt id="Documentation/git-merge.txt---no-verify-signatures"><span data-i18n="935b28fbb242f2a65ee80f9512b9e65d6719226f91e98398672133628704ae7f/ba" data-source="--no-verify-signatures" onmousemove="i18n(this)">--no-verify-signatures</span></dt> <dd> <p><span data-i18n="ba77e9f77bee68c21c20a7bb3115505b6a6eca33e0979eb1c1c47f064c653da6/1e" data-source="Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted." onmousemove="i18n(this)">&Ucy;&bcy;&iecy;&dcy;&icy;&tcy;&iecy;&scy;&softcy;, &chcy;&tcy;&ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ocy;&jcy; &bcy;&ocy;&kcy;&ocy;&vcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&acy;&ncy;&acy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy; &kcy;&lcy;&yucy;&chcy;&ocy;&mcy;, &tcy;. &iecy;. &kcy;&lcy;&yucy;&chcy;&ocy;&mcy; &scy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy; &icy;&dcy;&iecy;&ncy;&tcy;&icy;&fcy;&icy;&kcy;&acy;&tcy;&ocy;&rcy;&ocy;&mcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yacy;: &vcy; &mcy;&ocy;&dcy;&iecy;&lcy;&icy; &dcy;&ocy;&vcy;&iecy;&rcy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &ecy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &kcy;&lcy;&yucy;&chcy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&icy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&acy;&ncy; &dcy;&ocy;&vcy;&iecy;&rcy;&iecy;&ncy;&ncy;&ycy;&mcy; &kcy;&lcy;&yucy;&chcy;&ocy;&mcy;. &IEcy;&scy;&lcy;&icy; &kcy;&ocy;&ncy;&chcy;&icy;&kcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &bcy;&ocy;&kcy;&ocy;&vcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &ncy;&iecy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&acy;&ncy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy; &kcy;&lcy;&yucy;&chcy;&ocy;&mcy;, &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &pcy;&rcy;&iecy;&rcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---summary"><span data-i18n="a70d76ce0b3cccc19a7095152f8d434d716af2d8e230c90cc068c7ec8acce417/02" data-source="--summary" onmousemove="i18n(this)">--summary</span></dt> <dt id="Documentation/git-merge.txt---no-summary"><span data-i18n="6d717a0220057f7fc48057737ac997f854006a8ca247211a813ea3fc41f0def5/02" data-source="--no-summary" onmousemove="i18n(this)">--no-summary</span></dt> <dd> <p><span data-i18n="135660a82eb7a4ec5b5d4468f17d24402c182e7e6dd283b341152e2704c424eb/dc" data-source="Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future." onmousemove="i18n(this)">&Scy;&icy;&ncy;&ocy;&ncy;&icy;&mcy;&ycy; --stat &icy; --no-stat; &ocy;&ncy;&icy; &ucy;&scy;&tcy;&acy;&rcy;&iecy;&lcy;&icy; &icy; &bcy;&ucy;&dcy;&ucy;&tcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ycy; &vcy; &bcy;&ucy;&dcy;&ucy;&shchcy;&iecy;&mcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt--q"><span data-i18n="5ce681666a15a41274346f65b8bcbf56f8e8170ac00706a44a09ee4d786a8609/cd" data-source="-q" onmousemove="i18n(this)">-q</span></dt> <dt id="Documentation/git-merge.txt---quiet"><span data-i18n="b00818cdc507640687732769ee1cb501db377927ee76d03df23978bd0d706888/e2" data-source="--quiet" onmousemove="i18n(this)">--quiet</span></dt> <dd> <p><span data-i18n="9d9079910cdc79fe7fea31f927b81dd0285b53089951beefc2de0eebccacf5e1/66" data-source="Operate quietly. Implies --no-progress." onmousemove="i18n(this)">&Rcy;&acy;&bcy;&ocy;&tcy;&acy;&jcy;&tcy;&iecy; &tcy;&icy;&khcy;&ocy;. &Pcy;&ocy;&dcy;&rcy;&acy;&zcy;&ucy;&mcy;&iecy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; --no-progress.</span></p> </dd> <dt id="Documentation/git-merge.txt--v"><span data-i18n="81c36ccd44ef18baabad6e2d87038b72d606263bd6a3432b964a872023654fff/7c" data-source="-v" onmousemove="i18n(this)">-v</span></dt> <dt id="Documentation/git-merge.txt---verbose"><span data-i18n="bff1e8d3adf9e53481e9b21876983b359dc8a231bf7ebadde36a42dd7bd4db5c/93" data-source="--verbose" onmousemove="i18n(this)">--verbose</span></dt> <dd> <p><span data-i18n="fa713fd0cca63d1acee254650cc7c7e03f2c0238182b676c6e55302f4322a5ef/25" data-source="Be verbose." onmousemove="i18n(this)">Be verbose.</span></p> </dd> <dt id="Documentation/git-merge.txt---progress"><span data-i18n="c4d85ead394fc39f65f473a99058ad8fe951b5cd8d8dacc9e82d90e36b6430ea/a2" data-source="--progress" onmousemove="i18n(this)">--progress</span></dt> <dt id="Documentation/git-merge.txt---no-progress"><span data-i18n="22f4f0ddc705adf0de87e662c11a1d9f91a5693bfd2b50df9fec2f4ba289b775/63" data-source="--no-progress" onmousemove="i18n(this)">--no-progress</span></dt> <dd> <p><span data-i18n="1f797bf082ae06319864436f53ac218e9463c65adab6458dc0cc28205f7a7600/9f" data-source="Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting." onmousemove="i18n(this)">&Vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&iecy;/&vcy;&ycy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&iecy; &pcy;&rcy;&ocy;&gcy;&rcy;&iecy;&scy;&scy; &yacy;&vcy;&ncy;&ocy;. &IEcy;&scy;&lcy;&icy; &ncy;&icy; &ocy;&dcy;&icy;&ncy; &icy;&zcy; &ncy;&icy;&khcy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;, &pcy;&rcy;&ocy;&gcy;&rcy;&iecy;&scy;&scy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&iecy;&tcy;&scy;&yacy;, &iecy;&scy;&lcy;&icy; &kcy; &tcy;&iecy;&rcy;&mcy;&icy;&ncy;&acy;&lcy;&ucy; &pcy;&ocy;&dcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&acy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&acy;&yacy; &ocy;&shcy;&icy;&bcy;&kcy;&acy;. &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &ncy;&iecy; &vcy;&scy;&iecy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&ocy;&gcy;&ucy;&tcy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&tcy;&softcy; &ocy;&tcy;&chcy;&iecy;&tcy;&ycy; &ocy; &khcy;&ocy;&dcy;&iecy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---autostash"><span data-i18n="435cb83f611ed4f692feaadeeb7dc510c27efd47355418ced95aba18d9bc1c16/47" data-source="--autostash" onmousemove="i18n(this)">--autostash</span></dt> <dt id="Documentation/git-merge.txt---no-autostash"><span data-i18n="e5ea5d71c21b545a9814ce1be94fdf2c775156ea7c9c119441f5deae48ac38ab/89" data-source="--no-autostash" onmousemove="i18n(this)">--no-autostash</span></dt> <dd> <p><span data-i18n="84c92998683784e2b35cf0a36b5126e4a0702bcd05d54bdbdb0a7c4e8c6021d2/99" data-source="Automatically create a temporary stash entry before the operation begins, record it in the ref &lt;code&gt;MERGE_AUTOSTASH&lt;/code&gt; and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts." onmousemove="i18n(this)">&Acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &zcy;&acy;&pcy;&icy;&scy;&softcy; &vcy; &tcy;&acy;&jcy;&ncy;&icy;&kcy;&iecy; &pcy;&iecy;&rcy;&iecy;&dcy; &ncy;&acy;&chcy;&acy;&lcy;&ocy;&mcy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy;, &zcy;&acy;&pcy;&icy;&shcy;&icy;&tcy;&iecy; &iecy;&iecy; &vcy; ref  <code>MERGE_AUTOSTASH</code>  &icy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&tcy;&iecy; &pcy;&ocy;&scy;&lcy;&iecy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy;. &Ecy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&softcy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&yucy; &ncy;&acy; &laquo;&gcy;&rcy;&yacy;&zcy;&ncy;&ocy;&mcy;&raquo; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &scy; &ocy;&scy;&tcy;&ocy;&rcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy;&yucy;: &fcy;&icy;&ncy;&acy;&lcy;&softcy;&ncy;&ocy;&iecy; &pcy;&rcy;&icy;&lcy;&ocy;&zhcy;&iecy;&ncy;&icy;&iecy; stash &pcy;&ocy;&scy;&lcy;&iecy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&rcy;&icy;&vcy;&iecy;&scy;&tcy;&icy; &kcy; &ncy;&iecy;&tcy;&rcy;&icy;&vcy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&mcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&mcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---allow-unrelated-histories"><span data-i18n="99401a7cada550ce79e0f82bee3a3a5c1163a445ef1e788fdff5ac9755eab349/71" data-source="--allow-unrelated-histories" onmousemove="i18n(this)">--allow-unrelated-histories</span></dt> <dd> <p><span data-i18n="16abb2a4e569ae3cd428d2fc66a0e4359a713e2e100761a0814f654aa0837063/5f" data-source="By default, &lt;code&gt;git merge&lt;/code&gt; command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy;  <code>git merge</code>  &ocy;&tcy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&tcy;&softcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;, &ncy;&iecy; &icy;&mcy;&iecy;&yucy;&shchcy;&icy;&iecy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;. &Ecy;&tcy;&ucy; &ocy;&pcy;&tscy;&icy;&yucy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &ocy;&bcy;&khcy;&ocy;&dcy;&acy; &ecy;&tcy;&ocy;&jcy; &bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&ocy;&scy;&tcy;&icy; &pcy;&rcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&jcy; &dcy;&vcy;&ucy;&khcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&acy;&chcy;&acy;&lcy;&icy; &scy;&vcy;&ocy;&yucy; &zhcy;&icy;&zcy;&ncy;&softcy; &ncy;&iecy;&zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;. &Pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &ecy;&tcy;&ocy; &ocy;&chcy;&iecy;&ncy;&softcy; &rcy;&iecy;&dcy;&kcy;&icy;&jcy; &scy;&lcy;&ucy;&chcy;&acy;&jcy;, &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;, &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&yucy;&shchcy;&acy;&yacy; &vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &ecy;&tcy;&ocy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;, &ncy;&iecy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &icy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&acy;.</span></p> </dd> <dt id="Documentation/git-merge.txt--mltmsggt"><span data-i18n="6b2bc53940ee8c8405cdb7183f2a4c568530ed4b01e9e225ed8cd0d3c1fb2614/89" data-source="-m &amp;lt;msg&amp;gt;" onmousemove="i18n(this)">-m &lt;msg&gt;</span></dt> <dd> <p><span data-i18n="fffdaed73bc6d4ad64a7216b66aac046d49e563f1ce44c5e9653a4e4b009a5ba/4c" data-source="Set the commit message to be used for the merge commit (in case one is created)." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &dcy;&lcy;&yacy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; (&vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;, &iecy;&scy;&lcy;&icy; &ocy;&ncy;&ocy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&ocy;).</span></p> <p><span data-i18n="3902a11883e8b7910d634e2b52c57169dbf70ec31cce71c5d4a0ef012fe859bd/b6" data-source="If &lt;code&gt;--log&lt;/code&gt; is specified, a shortlog of the commits being merged will be appended to the specified message." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;  <code>--log</code> , &kcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&mcy;&ucy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yucy; &bcy;&ucy;&dcy;&iecy;&tcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy; &kcy;&rcy;&acy;&tcy;&kcy;&icy;&jcy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ycy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;.</span></p> <p><span data-i18n="708570481bc99a0df818931d9f239644267008e28b0c0aac94deed58e66af740/a7" data-source="The &lt;code&gt;git fmt-merge-msg&lt;/code&gt; command can be used to give a good default for automated &lt;code&gt;git merge&lt;/code&gt; invocations. The automated message can include the branch description." onmousemove="i18n(this)">&Kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy;  <code>git fmt-merge-msg</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &zcy;&acy;&dcy;&acy;&ncy;&icy;&yacy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&gcy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &dcy;&lcy;&yacy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &vcy;&ycy;&zcy;&ocy;&vcy;&ocy;&vcy;  <code>git merge</code> . &Acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&zcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&tcy;&softcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&icy;&iecy; &fcy;&icy;&lcy;&icy;&acy;&lcy;&acy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---into-nameltbranchgt"><span data-i18n="7e8dc8a494ffdd11d85a3ba3101a67dbecb13c4094d0fba3e3b242a0f348bfa9/ce" data-source="--into-name &amp;lt;branch&amp;gt;" onmousemove="i18n(this)">--into-name &lt;branch&gt;</span></dt> <dd> <p><span data-i18n="5e223f6fe57e334f0eb7cbf20e570850491fc5407bc7c468fbdaa2763f99ffdb/08" data-source="Prepare the default merge message as if merging to the branch &lt;code&gt;&amp;lt;branch&amp;gt;&lt;/code&gt;, instead of the name of the real branch to which the merge is made." onmousemove="i18n(this)">&Pcy;&ocy;&dcy;&gcy;&ocy;&tcy;&ocy;&vcy;&softcy;&tcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;, &kcy;&acy;&kcy; &pcy;&rcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy; &scy; &vcy;&iecy;&tcy;&kcy;&ocy;&jcy;  <code>&lt;branch&gt;</code> , &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &icy;&mcy;&iecy;&ncy;&icy; &rcy;&iecy;&acy;&lcy;&softcy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;, &scy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&jcy; &pcy;&rcy;&ocy;&icy;&zcy;&vcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;.</span></p> </dd> <dt id="Documentation/git-merge.txt--Fltfilegt"><span data-i18n="c2a83eac70d3ec4f2c0e6d7f39c55226b9f7bd1da1491cbb138542b00cc2184f/ff" data-source="-F &amp;lt;file&amp;gt;" onmousemove="i18n(this)">-F &lt;file&gt;</span></dt> <dt id="Documentation/git-merge.txt---fileltfilegt"><span data-i18n="cf1b9c43aa53808bbd71fa7e6cef9e75d758ece43b4ead72564272cd17a64da8/3e" data-source="--file=&amp;lt;file&amp;gt;" onmousemove="i18n(this)">--file=&lt;file&gt;</span></dt> <dd> <p><span data-i18n="fcbffa72b904722fac4f5821e1203d62254e4e74cc90e45041ad84569987a830/35" data-source="Read the commit message to be used for the merge commit (in case one is created)." onmousemove="i18n(this)">&Pcy;&rcy;&ocy;&chcy;&tcy;&icy;&tcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &dcy;&lcy;&yacy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; (&vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;, &iecy;&scy;&lcy;&icy; &ocy;&ncy;&ocy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&ocy;).</span></p> <p><span data-i18n="3902a11883e8b7910d634e2b52c57169dbf70ec31cce71c5d4a0ef012fe859bd/b6" data-source="If &lt;code&gt;--log&lt;/code&gt; is specified, a shortlog of the commits being merged will be appended to the specified message." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;  <code>--log</code> , &kcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&mcy;&ucy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yucy; &bcy;&ucy;&dcy;&iecy;&tcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy; &kcy;&rcy;&acy;&tcy;&kcy;&icy;&jcy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ycy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---rerere-autoupdate"><span data-i18n="43c74f65e0d9d1c69438db1ed03d4e5e5863408a6674c1e9d6831d14543668fe/7a" data-source="--rerere-autoupdate" onmousemove="i18n(this)">--rerere-autoupdate</span></dt> <dt id="Documentation/git-merge.txt---no-rerere-autoupdate"><span data-i18n="2ff823999087968f494b4f32b8d55be1e46326b3680d2fb17d3e8929ec491196/09" data-source="--no-rerere-autoupdate" onmousemove="i18n(this)">--no-rerere-autoupdate</span></dt> <dd> <p><span data-i18n="854915326a4a41d6390df56a9d3d1487178d7eddd59fb5fbc6317b45374a5b2c/a6" data-source="After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution. &lt;code&gt;--no-rerere-autoupdate&lt;/code&gt; is a good way to double-check what &lt;code&gt;rerere&lt;/code&gt; did and catch potential mismerges, before committing the result to the index with a separate &lt;code&gt;git add&lt;/code&gt;." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &kcy;&acy;&kcy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy; rerere &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ocy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&iecy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; &dcy;&lcy;&yacy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;, &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&iecy; &iecy;&mcy;&ucy; &tcy;&acy;&kcy;&zhcy;&iecy; &ocy;&bcy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; &scy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy;.  <code>--no-rerere-autoupdate</code>  &mdash; &khcy;&ocy;&rcy;&ocy;&shcy;&icy;&jcy; &scy;&pcy;&ocy;&scy;&ocy;&bcy; &pcy;&iecy;&rcy;&iecy;&pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&icy;&tcy;&softcy; &tcy;&ocy;, &chcy;&tcy;&ocy; &scy;&dcy;&iecy;&lcy;&acy;&lcy;  <code>rerere</code> , &icy; &vcy;&ycy;&yacy;&vcy;&icy;&tcy;&softcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ycy;&iecy; &ocy;&shcy;&icy;&bcy;&kcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &pcy;&rcy;&iecy;&zhcy;&dcy;&iecy; &chcy;&iecy;&mcy; &zcy;&acy;&ncy;&ocy;&scy;&icy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&tcy;&dcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy;  <code>git add</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt---overwrite-ignore"><span data-i18n="853f0aaf4eb80889e32fb23df7cc8d15f91c4da4b995e866ac49c34729ce1fba/c1" data-source="--overwrite-ignore" onmousemove="i18n(this)">--overwrite-ignore</span></dt> <dt id="Documentation/git-merge.txt---no-overwrite-ignore"><span data-i18n="93ee31ce8480dd50140d45d57a04e27c9c433c5b94cadcdb1bc1b563f01527b6/74" data-source="--no-overwrite-ignore" onmousemove="i18n(this)">--no-overwrite-ignore</span></dt> <dd> <p><span data-i18n="d5a88801a51f17acdcd0cfba066a9eaf74875a6aad7a552530bf1f36fd831104/01" data-source="Silently overwrite ignored files from the merge result. This is the default behavior. Use &lt;code&gt;--no-overwrite-ignore&lt;/code&gt; to abort." onmousemove="i18n(this)">&Tcy;&icy;&khcy;&ocy; &pcy;&iecy;&rcy;&iecy;&zcy;&acy;&pcy;&icy;&scy;&acy;&tcy;&softcy; &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&iecy;&mcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &icy;&zcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;. &Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>--no-overwrite-ignore</code>  &dcy;&lcy;&yacy; &pcy;&rcy;&iecy;&rcy;&ycy;&vcy;&acy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---abort"><span data-i18n="eea83aeda8cb36a95998ab5eb77be727f99e98311c29a90c13df34ee87991d66/7a" data-source="--abort" onmousemove="i18n(this)">--abort</span></dt> <dd> <p><span data-i18n="a18a949e403e4347388ffd52519ea2eb7b07900f269edaf40423909d3cb17fab/72" data-source="Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&rcy;&vcy;&icy;&tcy;&iecy; &tcy;&iecy;&kcy;&ucy;&shchcy;&icy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; &icy; &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&jcy;&tcy;&iecy;&scy;&softcy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&iecy; &dcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &IEcy;&scy;&lcy;&icy; &zcy;&acy;&pcy;&icy;&scy;&softcy; autostash &pcy;&rcy;&icy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy;, &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&tcy;&iecy; &iecy;&iecy; &kcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy;&ucy; &dcy;&iecy;&rcy;&iecy;&vcy;&ucy;.</span></p> <p><span data-i18n="3ff54e6af3b68d330c32273512a6923f521f7f3f529160c42cf348db5276eef4/5a" data-source="If there were uncommitted worktree changes present when the merge started, &lt;code&gt;git merge --abort&lt;/code&gt; will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running &lt;code&gt;git merge&lt;/code&gt;." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &pcy;&rcy;&icy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&rcy;&icy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&lcy;&icy; &ncy;&iecy;&zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;,  <code>git merge --abort</code>  &vcy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &scy;&lcy;&ucy;&chcy;&acy;&yacy;&khcy; &ncy;&iecy; &scy;&mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &ecy;&tcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;. &Pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &rcy;&iecy;&kcy;&ocy;&mcy;&iecy;&ncy;&dcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy;&scy;&iecy;&gcy;&dcy;&acy; &fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy;&lcy;&icy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&dcy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&ocy;&mcy;  <code>git merge</code> .</span></p> <p><span data-i18n="aa6d22620cdd9164a66baa7404b130b973a9979c34e7363e32537536b45f27c4/b7" data-source="&lt;code&gt;git merge --abort&lt;/code&gt; is equivalent to &lt;code&gt;git reset --merge&lt;/code&gt; when &lt;code&gt;MERGE_HEAD&lt;/code&gt; is present unless &lt;code&gt;MERGE_AUTOSTASH&lt;/code&gt; is also present in which case &lt;code&gt;git merge --abort&lt;/code&gt; applies the stash entry to the worktree whereas &lt;code&gt;git reset --merge&lt;/code&gt; will save the stashed changes in the stash list." onmousemove="i18n(this)"><code>git merge --abort</code>  &ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&iecy;&ncy;  <code>git reset --merge</code> , &kcy;&ocy;&gcy;&dcy;&acy; &pcy;&rcy;&icy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy;  <code>MERGE_HEAD</code> , &iecy;&scy;&lcy;&icy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy;  <code>MERGE_AUTOSTASH</code>  &ncy;&iecy; &pcy;&rcy;&icy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &tcy;&acy;&kcy;&zhcy;&iecy;, &icy; &vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;  <code>git merge --abort</code>  &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&softcy; &tcy;&acy;&jcy;&ncy;&icy;&kcy;&acy; &kcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy;&ucy; &dcy;&iecy;&rcy;&iecy;&vcy;&ucy;, &tcy;&ocy;&gcy;&dcy;&acy; &kcy;&acy;&kcy;  <code>git reset --merge</code>  &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&iecy;&tcy; &scy;&pcy;&rcy;&yacy;&tcy;&acy;&ncy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &tcy;&acy;&jcy;&ncy;&icy;&kcy;&acy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---quit"><span data-i18n="df2c6d5508e1f0a2315e06c6032b8bc76b6e828bc56bbab66d89ec4f71d10f29/e5" data-source="--quit" onmousemove="i18n(this)">--quit</span></dt> <dd> <p><span data-i18n="1d8b75cf81565d7523fce7da744b553ef551384e4a0764a5c3f90590956ab456/8a" data-source="Forget about the current merge in progress. Leave the index and the working tree as-is. If &lt;code&gt;MERGE_AUTOSTASH&lt;/code&gt; is present, the stash entry will be saved to the stash list." onmousemove="i18n(this)">&Zcy;&acy;&bcy;&ucy;&dcy;&softcy;&tcy;&iecy; &ocy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy;. &Ocy;&scy;&tcy;&acy;&vcy;&softcy;&tcy;&iecy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; &icy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &kcy;&acy;&kcy; &iecy;&scy;&tcy;&softcy;. &IEcy;&scy;&lcy;&icy; &pcy;&rcy;&icy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy;  <code>MERGE_AUTOSTASH</code> , &zcy;&acy;&pcy;&icy;&scy;&softcy; &tcy;&acy;&jcy;&ncy;&icy;&kcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&iecy;&ncy;&acy; &vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &tcy;&acy;&jcy;&ncy;&icy;&kcy;&acy;.</span></p> </dd> <dt id="Documentation/git-merge.txt---continue"><span data-i18n="a06a8ce6e8eddeea26bb4ce1a5233519275843923fd9619cbd7927cc69da5eb1/28" data-source="--continue" onmousemove="i18n(this)">--continue</span></dt> <dd> <p><span data-i18n="026e63cd7c2e2ae52236ba1d4931b014da9bdf5099a839a34ffe8969caef6a2a/91" data-source="After a &lt;code&gt;git merge&lt;/code&gt; stops due to conflicts you can conclude the merge by running &lt;code&gt;git merge --continue&lt;/code&gt; (see &amp;quot;HOW TO RESOLVE CONFLICTS&amp;quot; section below)." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &ocy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&icy;  <code>git merge</code>  &icy;&zcy;-&zcy;&acy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&vcy;  <code>git merge --continue</code>  (&scy;&mcy;. &rcy;&acy;&zcy;&dcy;&iecy;&lcy;  &quot;HOW TO RESOLVE CONFLICTS&quot;  &ncy;&icy;&zhcy;&iecy;).</span></p> </dd> <dt id="Documentation/git-merge.txt-ltcommitgt82308203"><span data-i18n="6b2cc0df1622e7d77d9c487c261a2a47c980aa9881ef82196b13707fb343b49c/4c" data-source="&amp;lt;commit&amp;gt;&amp;hellip;" onmousemove="i18n(this)">&lt;commit&gt;&hellip;</span></dt> <dd> <p><span data-i18n="15ab09518d2a9a9b0e9774b3befb4c22634f5b709231e824b524c52d9b20ebf5/49" data-source="Commits, usually other branch heads, to merge into our branch. Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge)." onmousemove="i18n(this)">&Ocy;&bcy;&yacy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;, &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&iecy;&jcy; &fcy;&icy;&lcy;&icy;&acy;&lcy;&ocy;&vcy;, &pcy;&rcy;&icy;&scy;&ocy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy;&scy;&yacy; &kcy; &ncy;&acy;&shcy;&iecy;&mcy;&ucy; &fcy;&icy;&lcy;&icy;&acy;&lcy;&ucy;. &Ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&iecy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy; &scy;&ocy;&zcy;&dcy;&acy;&scy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &scy; &bcy;&ocy;&lcy;&iecy;&iecy; &chcy;&iecy;&mcy; &dcy;&vcy;&ucy;&mcy;&yacy; &rcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&mcy;&icy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&acy;&mcy;&icy; (&lcy;&acy;&scy;&kcy;&ocy;&vcy;&ocy; &ncy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&mcy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;&mcy; Octopus).</span></p> <p><span data-i18n="57af511300dfe0f60951b0ef20952a3224e98a88b5649285bf079d1b770f3b56/a3" data-source="If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy; &ncy;&iecy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yacy;, &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &tcy;&iecy;&kcy;&ucy;&shchcy;&acy;&yacy; &vcy;&iecy;&tcy;&kcy;&acy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&acy; &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;. &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; &ncy;&acy; &ecy;&tcy;&ocy;&jcy; &scy;&tcy;&rcy;&acy;&ncy;&icy;&tscy;&iecy; &rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&scy;&tcy;&vcy;&acy;.</span></p> <p><span data-i18n="35fcf8fd4109efc00161848fba7fdda6122902d6b20ab954ede4c412971d1ee4/fe" data-source="When &lt;code&gt;FETCH_HEAD&lt;/code&gt; (and no other commit) is specified, the branches recorded in the &lt;code&gt;.git/FETCH_HEAD&lt;/code&gt; file by the previous invocation of &lt;code&gt;git fetch&lt;/code&gt; for merging are merged to the current branch." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;  <code>FETCH_HEAD</code>  (&icy; &ncy;&icy;&kcy;&acy;&kcy;&acy;&yacy; &dcy;&rcy;&ucy;&gcy;&acy;&yacy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yacy;), &vcy;&iecy;&tcy;&kcy;&icy;, &zcy;&acy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ycy;&iecy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>.git/FETCH_HEAD</code>  &pcy;&rcy;&icy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&iecy;&mcy; &vcy;&ycy;&zcy;&ocy;&vcy;&iecy;  <code>git fetch</code>  &dcy;&lcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&yucy;&tcy;&scy;&yacy; &scy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&vcy;&softcy;&yucy;.</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="_pre_merge_checks"><span data-i18n="edc6c70040c70beca727cf486cecc8d26d3dc08d9962b0bba2a0c390b4048f85/a0" data-source="Pre-merge checks" onmousemove="i18n(this)">Pre-merge checks</span></h2> <div> <p><span data-i18n="21e9c2742392b5891bfee96f11e1eef2de0db7233a0de2996de07aac3087eb01/26" data-source="Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts. See also &lt;a href=&quot;git-stash&quot;&gt;git-stash[1]&lt;/a&gt;. &lt;code&gt;git pull&lt;/code&gt; and &lt;code&gt;git merge&lt;/code&gt; will stop without doing anything when local uncommitted changes overlap with files that &lt;code&gt;git pull&lt;/code&gt;/&lt;code&gt;git
merge&lt;/code&gt; may need to update." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&zhcy;&dcy;&iecy; &chcy;&iecy;&mcy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&tcy;&softcy; &vcy;&ncy;&iecy;&shcy;&ncy;&icy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &vcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &pcy;&rcy;&icy;&vcy;&iecy;&scy;&tcy;&icy; &scy;&vcy;&ocy;&yucy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ucy;&yucy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &vcy; &khcy;&ocy;&rcy;&ocy;&shcy;&ucy;&yucy; &fcy;&ocy;&rcy;&mcy;&ucy; &icy; &zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &iecy;&iecy; &lcy;&ocy;&kcy;&acy;&lcy;&softcy;&ncy;&ocy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&ncy;&acy; &ncy;&iecy; &bcy;&ycy;&lcy;&acy; &icy;&scy;&pcy;&ocy;&rcy;&chcy;&iecy;&ncy;&acy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&ncy;&ocy;&vcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;. &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="git-stash.html">git-stash[1]</a> .  <code>git pull</code>  &icy;  <code>git merge</code>  &ocy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&yacy;&tcy;&scy;&yacy;, &ncy;&icy;&chcy;&iecy;&gcy;&ocy; &ncy;&iecy; &dcy;&iecy;&lcy;&acy;&yacy;, &iecy;&scy;&lcy;&icy; &lcy;&ocy;&kcy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &ncy;&iecy;&zcy;&acy;&fcy;&icy;&kcy;&scy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&kcy;&rcy;&ycy;&vcy;&acy;&yucy;&tcy;&scy;&yacy; &scy; &fcy;&acy;&jcy;&lcy;&acy;&mcy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy;  <code>git pull</code> / <code>git merge</code> , &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &pcy;&ocy;&tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy;&scy;&yacy; &ocy;&bcy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy;.</span></p> <p><span data-i18n="3aac025e936ce20cf7148ab78162915701aa0d343a280f95cba7848a987a2b08/25" data-source="To avoid recording unrelated changes in the merge commit, &lt;code&gt;git pull&lt;/code&gt; and &lt;code&gt;git merge&lt;/code&gt; will also abort if there are any changes registered in the index relative to the &lt;code&gt;HEAD&lt;/code&gt; commit. (Special narrow exceptions to this rule may exist depending on which merge strategy is in use, but generally, the index must match HEAD.)" onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &icy;&zcy;&bcy;&iecy;&zhcy;&acy;&tcy;&softcy; &zcy;&acy;&pcy;&icy;&scy;&icy; &ncy;&iecy;&scy;&vcy;&yacy;&zcy;&acy;&ncy;&ncy;&ycy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &vcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;,  <code>git pull</code>  &icy;  <code>git merge</code>  &tcy;&acy;&kcy;&zhcy;&iecy; &pcy;&rcy;&iecy;&rcy;&ycy;&vcy;&acy;&yucy;&tcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy;, &iecy;&scy;&lcy;&icy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&iecy; &zcy;&acy;&rcy;&iecy;&gcy;&icy;&scy;&tcy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ycy; &kcy;&acy;&kcy;&icy;&iecy;-&lcy;&icy;&bcy;&ocy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &ocy;&tcy;&ncy;&ocy;&scy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;  <code>HEAD</code> . (&Ocy;&scy;&ocy;&bcy;&ycy;&iecy; &ucy;&zcy;&kcy;&icy;&iecy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yacy; &icy;&zcy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&acy; &mcy;&ocy;&gcy;&ucy;&tcy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &tcy;&ocy;&gcy;&ocy;, &kcy;&acy;&kcy;&acy;&yacy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;, &ncy;&ocy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy; HEAD.)</span></p> <p><span data-i18n="03f1c4a538b27d1c4397e220e567187c2c73dfe5a67db800f5393027f5e6d2b5/b8" data-source="If all named commits are already ancestors of &lt;code&gt;HEAD&lt;/code&gt;, &lt;code&gt;git merge&lt;/code&gt; will exit early with the message &amp;quot;Already up to date.&amp;quot;" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&scy;&iecy; &icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ycy; &ucy;&zhcy;&iecy; &yacy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;&mcy;&icy;  <code>HEAD</code> ,  <code>git merge</code>  &vcy;&ycy;&jcy;&dcy;&iecy;&tcy; &rcy;&acy;&ncy;&softcy;&shcy;&iecy; &scy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy;&mcy;  &quot;Already up to date.&quot; .</span></p> </div> <h2 class="text-body-emphasis"  id="_fast_forward_merge"><span data-i18n="a26303f8f6a8fc1d4753825bd6f737512ef589986b47f87c06d38ba206946a3b/90" data-source="Fast-forward merge" onmousemove="i18n(this)">Fast-forward merge</span></h2> <div> <p><span data-i18n="56844edf50e96c3f8cd6a56febbf837e052ac885198b5a8e89d075a90fd82522/9e" data-source="Often the current branch head is an ancestor of the named commit. This is the most common case especially when invoked from &lt;code&gt;git
pull&lt;/code&gt;: you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision. In this case, a new commit is not needed to store the combined history; instead, the &lt;code&gt;HEAD&lt;/code&gt; (along with the index) is updated to point at the named commit, without creating an extra merge commit." onmousemove="i18n(this)">&CHcy;&acy;&scy;&tcy;&ocy; &tcy;&iecy;&kcy;&ucy;&shchcy;&icy;&jcy; &gcy;&lcy;&acy;&vcy;&acy; &vcy;&iecy;&tcy;&kcy;&icy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&rcy;&iecy;&dcy;&kcy;&ocy;&mcy; &icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;. &Ecy;&tcy;&ocy; &ncy;&acy;&icy;&bcy;&ocy;&lcy;&iecy;&iecy; &rcy;&acy;&scy;&pcy;&rcy;&ocy;&scy;&tcy;&rcy;&acy;&ncy;&iecy;&ncy;&ncy;&ycy;&jcy; &scy;&lcy;&ucy;&chcy;&acy;&jcy;, &ocy;&scy;&ocy;&bcy;&iecy;&ncy;&ncy;&ocy; &pcy;&rcy;&icy; &vcy;&ycy;&zcy;&ocy;&vcy;&iecy; &icy;&zcy;  <code>git pull</code> : &vcy;&ycy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;&iecy; &vcy;&ycy;&shcy;&iecy;&scy;&tcy;&ocy;&yacy;&shchcy;&icy;&jcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy;, &ncy;&iecy; &vcy;&ncy;&iecy;&scy;&lcy;&icy; &ncy;&icy;&kcy;&acy;&kcy;&icy;&khcy; &lcy;&ocy;&kcy;&acy;&lcy;&softcy;&ncy;&ycy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &icy; &tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &ocy;&bcy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy;&scy;&yacy; &dcy;&ocy; &bcy;&ocy;&lcy;&iecy;&iecy; &ncy;&ocy;&vcy;&ocy;&jcy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy;. &Vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &ncy;&ocy;&vcy;&ycy;&jcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy; &dcy;&lcy;&yacy; &khcy;&rcy;&acy;&ncy;&iecy;&ncy;&icy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&ocy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy; &ncy;&iecy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy;&scy;&yacy;; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy;  <code>HEAD</code>  (&vcy;&mcy;&iecy;&scy;&tcy;&iecy; &scy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ocy;&mcy;) &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &ncy;&acy; &icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;, &bcy;&iecy;&zcy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yacy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="14e9b3bcad502308b17fc726581b5c6ad47ee6e5645016caa3228e03344eed7c/1f" data-source="This behavior can be suppressed with the &lt;code&gt;--no-ff&lt;/code&gt; option." onmousemove="i18n(this)">&Tcy;&acy;&kcy;&ocy;&iecy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &pcy;&ocy;&dcy;&acy;&vcy;&icy;&tcy;&softcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&pcy;&tscy;&icy;&icy;  <code>--no-ff</code> .</span></p> </div> <h2 class="text-body-emphasis"  id="_true_merge"><span data-i18n="0588fcd06570e00820b52ea318e4d0a0960776c3a3a7d3ccf4870fe8ecd1aa7e/ff" data-source="True merge" onmousemove="i18n(this)">True merge</span></h2> <div> <p><span data-i18n="d22045d0eef4869867eb613c7d3b8cb31db23c343fb6b964bff32c24e32be963/27" data-source="Except in a fast-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents." onmousemove="i18n(this)">&Zcy;&acy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &bcy;&ycy;&scy;&tcy;&rcy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; (&scy;&mcy;. &vcy;&ycy;&shcy;&iecy;), &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ycy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ycy; &vcy;&mcy;&iecy;&scy;&tcy;&iecy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &ocy;&ncy;&icy; &ocy;&bcy;&iecy; &yacy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &rcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&mcy;&icy;.</span></p> <p><span data-i18n="230a29d7a49d437354ae95fe59992df06184826237b2a96f154f1c186314d1ff/e7" data-source="A merged version reconciling the changes from all branches to be merged is committed, and your &lt;code&gt;HEAD&lt;/code&gt;, index, and working tree are updated to it. It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them." onmousemove="i18n(this)">&Ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&acy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;, &scy;&ocy;&gcy;&lcy;&acy;&scy;&ucy;&yucy;&shchcy;&acy;&yacy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&zcy; &vcy;&scy;&iecy;&khcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ycy;&khcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;, &fcy;&icy;&kcy;&scy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy;, &icy; &vcy;&acy;&shcy;  <code>HEAD</code> , &icy;&ncy;&dcy;&iecy;&kcy;&scy; &icy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &dcy;&ocy; &ncy;&iecy;&iecy;. &Vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &vcy;&ncy;&ocy;&scy;&icy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &iecy;&scy;&lcy;&icy; &ocy;&ncy;&icy; &ncy;&iecy; &pcy;&iecy;&rcy;&iecy;&kcy;&rcy;&ycy;&vcy;&acy;&yucy;&tcy;&scy;&yacy;; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&tcy; &icy;&khcy;.</span></p> <p><span data-i18n="91653cfef543c643135e409348e8cc4420c6273fdbc8e17fe7cf346347fc4c2d/d0" data-source="When it is not obvious how to reconcile the changes, the following happens:" onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy; &ncy;&iecy; &ocy;&chcy;&iecy;&vcy;&icy;&dcy;&ncy;&ocy;, &kcy;&acy;&kcy; &scy;&ocy;&gcy;&lcy;&acy;&scy;&ocy;&vcy;&acy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&dcy;&icy;&tcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&iecy;:</span></p> <div> <ol> <li> <p><span data-i18n="a349839923d9c7366159881c1dd1d122669ae5f4d44c04ba797478f66c57b98e/78" data-source="The &lt;code&gt;HEAD&lt;/code&gt; pointer stays the same." onmousemove="i18n(this)">&Ucy;&kcy;&acy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;  <code>HEAD</code>  &ocy;&scy;&tcy;&acy;&lcy;&scy;&yacy; &pcy;&rcy;&iecy;&zhcy;&ncy;&icy;&mcy;.</span></p> </li> <li> <p><span data-i18n="0480a7d5afc8d3aa7422ee884b798f2261b2e55ef846c610f4b2236ea2d01275/46" data-source="The &lt;code&gt;MERGE_HEAD&lt;/code&gt; ref is set to point to the other branch head." onmousemove="i18n(this)">&Scy;&scy;&ycy;&lcy;&kcy;&acy;  <code>MERGE_HEAD</code>  &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&acy; &ncy;&acy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&iecy; &ncy;&acy; &dcy;&rcy;&ucy;&gcy;&ucy;&yucy; &gcy;&ocy;&lcy;&ocy;&vcy;&ucy; &vcy;&iecy;&tcy;&kcy;&icy;.</span></p> </li> <li> <p><span data-i18n="5261dcd5d79fd3a6751ccb7e761e1e1f5a9561e8ea6a516123abd021b5704415/32" data-source="Paths that merged cleanly are updated both in the index file and in your working tree." onmousemove="i18n(this)">&Pcy;&ucy;&tcy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &bcy;&ycy;&lcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ycy; &bcy;&iecy;&zcy; &ocy;&shcy;&icy;&bcy;&ocy;&kcy;, &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ncy;&ocy;&mcy; &fcy;&acy;&jcy;&lcy;&iecy;, &tcy;&acy;&kcy; &icy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;.</span></p> </li> <li> <p> <span data-i18n="722e93c29fb94c0c83be21a9d61faa4d946ae480c44b6cc51c0df573ef033b4c/ef" data-source="For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from &lt;code&gt;HEAD&lt;/code&gt;, and stage 3 from &lt;code&gt;MERGE_HEAD&lt;/code&gt; (you can inspect the stages with &lt;code&gt;git ls-files -u&lt;/code&gt;). The working tree files contain the result of the merge operation; i.e. 3-way merge results with familiar conflict markers &lt;code&gt;&amp;lt;&amp;lt;&amp;lt;&lt;/code&gt;&lt;code&gt;===&lt;/code&gt;&lt;code&gt;&amp;gt;&amp;gt;&amp;gt;&lt;/code&gt;." onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&khcy; &pcy;&ucy;&tcy;&iecy;&jcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ncy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &dcy;&ocy; &tcy;&rcy;&iecy;&khcy; &vcy;&iecy;&rcy;&scy;&icy;&jcy;: &ncy;&acy; &ecy;&tcy;&acy;&pcy;&iecy; 1 &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&yacy; &ocy;&tcy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;, &ncy;&acy; &ecy;&tcy;&acy;&pcy;&iecy; 2 &mdash; &icy;&zcy;  <code>HEAD</code> , &acy; &ncy;&acy; &ecy;&tcy;&acy;&pcy;&iecy; 3 &mdash; &icy;&zcy;  <code>MERGE_HEAD</code>  (&vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&icy;&tcy;&softcy; &ecy;&tcy;&acy;&pcy;&ycy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>git ls-files -u</code> ). &Fcy;&acy;&jcy;&lcy;&ycy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;; &tcy;.&iecy;. &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ycy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy;&ocy; &zcy;&ncy;&acy;&kcy;&ocy;&mcy;&ycy;&mcy;&icy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy;&mcy;&icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;  <code>&lt;&lt;&lt;</code> <code>===</code> <code>&gt;&gt;&gt;</code>  .</span></p> </li> <li> <p><span data-i18n="da1caed7232853326a998f232298c4da3a400567045357734ba6555b9e95a340/cd" data-source="A ref named &lt;code&gt;AUTO_MERGE&lt;/code&gt; is written, pointing to a tree corresponding to the current content of the working tree (including conflict markers for textual conflicts). Note that this ref is only written when the &lt;code&gt;ort&lt;/code&gt; merge strategy is used (the default)." onmousemove="i18n(this)">&Zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy;&scy;&ycy;&lcy;&kcy;&acy; &scy; &icy;&mcy;&iecy;&ncy;&iecy;&mcy;  <code>AUTO_MERGE</code> , &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&yucy;&shchcy;&acy;&yacy; &ncy;&acy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy;, &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&mcy;&ucy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&mcy;&ucy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; (&vcy;&kcy;&lcy;&yucy;&chcy;&acy;&yacy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &dcy;&lcy;&yacy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;). &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &ecy;&tcy;&acy; &scy;&scy;&ycy;&lcy;&kcy;&acy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &pcy;&rcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&icy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  <code>ort</code>  (&pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;).</span></p> </li> <li> <p><span data-i18n="31bb012e490acc518b63521597cac97db33e02ba95053e3d4228f8e6725f5ca3/3e" data-source="No other changes are made. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i.e. matching &lt;code&gt;HEAD&lt;/code&gt;." onmousemove="i18n(this)">&Ncy;&icy;&kcy;&acy;&kcy;&icy;&khcy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &ncy;&iecy; &pcy;&rcy;&ocy;&icy;&zcy;&vcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy;. &Vcy; &chcy;&acy;&scy;&tcy;&ncy;&ocy;&scy;&tcy;&icy;, &lcy;&ocy;&kcy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ncy;&ycy;&iecy; &dcy;&ocy; &ncy;&acy;&chcy;&acy;&lcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &ocy;&scy;&tcy;&acy;&ncy;&ucy;&tcy;&scy;&yacy; &pcy;&rcy;&iecy;&zhcy;&ncy;&icy;&mcy;&icy;, &acy; &zcy;&acy;&pcy;&icy;&scy;&icy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&acy; &dcy;&lcy;&yacy; &ncy;&icy;&khcy; &ocy;&scy;&tcy;&acy;&ncy;&ucy;&tcy;&scy;&yacy; &pcy;&rcy;&iecy;&zhcy;&ncy;&icy;&mcy;&icy;, &tcy;. &iecy;. &bcy;&ucy;&dcy;&ucy;&tcy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>HEAD</code>  .</span></p> </li> </ol> </div> <p><span data-i18n="ab0c8c20d1df00a1e368968fb43d3496088bbe7b0baa51baf8019c468554852d/03" data-source="If you tried a merge which resulted in complex conflicts and want to start over, you can recover with &lt;code&gt;git merge --abort&lt;/code&gt;." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &pcy;&ocy;&pcy;&rcy;&ocy;&bcy;&ocy;&vcy;&acy;&lcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &pcy;&rcy;&icy;&vcy;&iecy;&lcy;&ocy; &kcy; &scy;&lcy;&ocy;&zhcy;&ncy;&ycy;&mcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&mcy; &icy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &ncy;&acy;&chcy;&acy;&tcy;&softcy; &vcy;&scy;&iecy; &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &iecy;&gcy;&ocy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>git merge --abort</code> .</span></p> </div> <h2 class="text-body-emphasis"  id="_merging_tag"><span data-i18n="66408f7541ad0034ff603169d594b063f1558c00271091bfecc8f3cf902f6826/25" data-source="Merging tag" onmousemove="i18n(this)">Merging tag</span></h2> <div> <p><span data-i18n="3a0bf7bcd45ac34df41c1e9a8de950095267aa93d764a54daa3428d23bb13629/b2" data-source="When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast-forward merge is possible, and the commit message template is prepared with the tag message. Additionally, if the tag is signed, the signature check is reported as a comment in the message template. See also &lt;a href=&quot;git-tag&quot;&gt;git-tag[1]&lt;/a&gt;." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy; &acy;&ncy;&ncy;&ocy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; (&icy;, &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;, &pcy;&ocy;&dcy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy;) &tcy;&iecy;&gcy;&acy;  Git  &vcy;&scy;&iecy;&gcy;&dcy;&acy; &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &dcy;&acy;&zhcy;&iecy; &iecy;&scy;&lcy;&icy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy; &ucy;&scy;&kcy;&ocy;&rcy;&iecy;&ncy;&ncy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &icy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &pcy;&ocy;&dcy;&gcy;&ocy;&tcy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy;&mcy; &tcy;&iecy;&gcy;&acy;. &Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &iecy;&scy;&lcy;&icy; &tcy;&iecy;&gcy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&acy;&ncy;, &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&acy; &pcy;&ocy;&dcy;&pcy;&icy;&scy;&icy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &vcy;&icy;&dcy;&iecy; &kcy;&ocy;&mcy;&mcy;&iecy;&ncy;&tcy;&acy;&rcy;&icy;&yacy; &vcy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy;. &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="git-tag.html">git-tag[1]</a> .</span></p> <p><span data-i18n="f2e9384c1a44d2b9176864c1d45c3cba48fb0fe5d7da4e28f8e79c55d7de5a42/79" data-source="When you want to just integrate with the work leading to the commit that happens to be tagged, e.g. synchronizing with an upstream release point, you may not want to make an unnecessary merge commit." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &scy; &rcy;&acy;&bcy;&ocy;&tcy;&ocy;&jcy;, &vcy;&iecy;&dcy;&ucy;&shchcy;&iecy;&jcy; &kcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &pcy;&ocy;&mcy;&iecy;&chcy;&iecy;&ncy;&acy; &tcy;&iecy;&gcy;&acy;&mcy;&icy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &scy;&icy;&ncy;&khcy;&rcy;&ocy;&ncy;&icy;&zcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &scy; &vcy;&ycy;&shcy;&iecy;&scy;&tcy;&ocy;&yacy;&shchcy;&iecy;&jcy; &tcy;&ocy;&chcy;&kcy;&ocy;&jcy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ncy;&iecy; &zcy;&acy;&khcy;&ocy;&tcy;&iecy;&tcy;&softcy; &dcy;&iecy;&lcy;&acy;&tcy;&softcy; &ncy;&iecy;&ncy;&ucy;&zhcy;&ncy;&ucy;&yucy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="bad0a50be6be08a03b1359d1f241773783369268201f307db2421218a5739864/1f" data-source="In such a case, you can &amp;quot;unwrap&amp;quot; the tag yourself before feeding it to &lt;code&gt;git merge&lt;/code&gt;, or pass &lt;code&gt;--ff-only&lt;/code&gt; when you do not have any work on your own. e.g." onmousemove="i18n(this)">&Vcy; &tcy;&acy;&kcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&acy;&mcy;&ocy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&tcy;&softcy; &tcy;&iecy;&gcy;  &quot;unwrap&quot;  &pcy;&iecy;&rcy;&iecy;&dcy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&chcy;&iecy;&jcy; &iecy;&gcy;&ocy; &vcy;  <code>git merge</code>  &icy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&tcy;&softcy;  <code>--ff-only</code> , &kcy;&ocy;&gcy;&dcy;&acy; &ucy; &vcy;&acy;&scy; &ncy;&iecy;&tcy; &scy;&acy;&mcy;&ocy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &rcy;&acy;&bcy;&ocy;&tcy;&ycy;. &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;</span></p> <div> <div> <pre class="hljs language-sql">git <span class="hljs-keyword">fetch</span> origin
git <span class="hljs-keyword">merge</span> v1<span class="hljs-number">.2</span><span class="hljs-number">.3</span><span class="hljs-operator">^</span><span class="hljs-number">0</span>
git <span class="hljs-keyword">merge</span> <span class="hljs-comment">--ff-only v1.2.3</span></pre> </div> </div> </div> <h2 class="text-body-emphasis"  id="_how_conflicts_are_presented"><span data-i18n="aa43da075ebb66f2ee10db7fd8cf32d08027873ed37043d8a50bf98bdb424050/78" data-source="How conflicts are presented" onmousemove="i18n(this)">&Kcy;&acy;&kcy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;</span></h2> <div> <p><span data-i18n="f59efc89780510465a4eeb621402759524187866eabcaa8b3aff9be05ffed071/19" data-source="During a merge, the working tree files are updated to reflect the result of the merge. Among the changes made to the common ancestor&amp;rsquo;s version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area." onmousemove="i18n(this)">&Vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&tcy;&rcy;&acy;&zcy;&icy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Scy;&rcy;&iecy;&dcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;, &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ncy;&ycy;&khcy; &vcy; &vcy;&iecy;&rcy;&scy;&icy;&yucy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;, &ncy;&iecy;&pcy;&iecy;&rcy;&iecy;&scy;&iecy;&kcy;&acy;&yucy;&shchcy;&icy;&iecy;&scy;&yacy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; (&tcy;&ocy; &iecy;&scy;&tcy;&softcy; &vcy;&ycy; &icy;&zcy;&mcy;&iecy;&ncy;&icy;&lcy;&icy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy;&acy;, &vcy; &tcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &kcy;&acy;&kcy; &dcy;&rcy;&ucy;&gcy;&acy;&yacy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&acy; &ocy;&scy;&tcy;&acy;&vcy;&icy;&lcy;&acy; &ecy;&tcy;&ucy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&softcy; &ncy;&iecy;&tcy;&rcy;&ocy;&ncy;&ucy;&tcy;&ocy;&jcy;, &icy;&lcy;&icy; &ncy;&acy;&ocy;&bcy;&ocy;&rcy;&ocy;&tcy;) &dcy;&ocy;&scy;&lcy;&ocy;&vcy;&ncy;&ocy; &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&yucy;&tcy;&scy;&yacy; &vcy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&jcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy;, &kcy;&ocy;&gcy;&dcy;&acy; &ocy;&bcy;&iecy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ycy; &vcy;&ncy;&iecy;&scy;&lcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy; &ocy;&dcy;&ncy;&ucy; &icy; &tcy;&ucy; &zhcy;&iecy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&softcy;,  Git  &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &scy;&lcy;&ucy;&chcy;&acy;&jcy;&ncy;&ycy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy; &vcy;&ycy;&bcy;&rcy;&acy;&tcy;&softcy; &ocy;&dcy;&ncy;&ucy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ucy; &pcy;&iecy;&rcy;&iecy;&dcy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &icy; &pcy;&rcy;&ocy;&scy;&icy;&tcy; &vcy;&acy;&scy; &rcy;&iecy;&shcy;&icy;&tcy;&softcy; &ecy;&tcy;&ucy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy;&ucy;, &ocy;&scy;&tcy;&acy;&vcy;&icy;&vcy; &tcy;&ocy;, &chcy;&tcy;&ocy; &ocy;&bcy;&iecy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ycy; &scy;&dcy;&iecy;&lcy;&acy;&lcy;&icy; &scy; &ecy;&tcy;&ocy;&jcy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&softcy;&yucy;.</span></p> <p><span data-i18n="1061f9b16ed7fe70cadc6b3b67be851a0fc36c61b61a73d1f29189e066d8bc53/c8" data-source="By default, Git uses the same style as the one used by the &amp;quot;merge&amp;quot; program from the RCS suite to present such a conflicted hunk, like this:" onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  Git  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &tcy;&ocy;&tcy; &zhcy;&iecy; &scy;&tcy;&icy;&lcy;&softcy;, &chcy;&tcy;&ocy; &icy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&acy;  &quot;merge&quot;  &icy;&zcy; &pcy;&acy;&kcy;&iecy;&tcy;&acy; RCS, &dcy;&lcy;&yacy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &tcy;&acy;&kcy;&ocy;&gcy;&ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&iecy;&gcy;&ocy; &fcy;&rcy;&acy;&gcy;&mcy;&iecy;&ncy;&tcy;&acy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:</span></p> <div> <div> <pre class="hljs language-sql">Here <span class="hljs-keyword">are</span> lines that <span class="hljs-keyword">are</span> either unchanged <span class="hljs-keyword">from</span> the common
ancestor, <span class="hljs-keyword">or</span> cleanly resolved because <span class="hljs-keyword">only</span> <span class="hljs-keyword">one</span> side changed,
<span class="hljs-keyword">or</span> cleanly resolved because <span class="hljs-keyword">both</span> sides changed the same way.
<span class="hljs-operator">&lt;&lt;</span><span class="hljs-operator">&lt;&lt;</span><span class="hljs-operator">&lt;&lt;</span><span class="hljs-operator">&lt;</span> yours:sample.txt
Conflict resolution <span class="hljs-keyword">is</span> hard;
let<span class="hljs-string">&apos;s go shopping.
=======
Git makes conflict resolution easy.
&gt;&gt;&gt;&gt;&gt;&gt;&gt; theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.</span></pre> </div> </div> <p><span data-i18n="8bc3cd191f53b69d13627b5f7e4a644d3c733046b1d6f6de622bb743aa76d48d/6f" data-source="The area where a pair of conflicting changes happened is marked with markers &lt;code&gt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&lt;/code&gt;, &lt;code&gt;=======&lt;/code&gt;, and &lt;code&gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&lt;/code&gt;. The part before the &lt;code&gt;=======&lt;/code&gt; is typically your side, and the part afterwards is typically their side." onmousemove="i18n(this)">&Ocy;&bcy;&lcy;&acy;&scy;&tcy;&softcy;, &gcy;&dcy;&iecy; &pcy;&rcy;&ocy;&icy;&zcy;&ocy;&shcy;&lcy;&acy; &pcy;&acy;&rcy;&acy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;, &ocy;&tcy;&mcy;&iecy;&chcy;&iecy;&ncy;&acy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy;&mcy;&icy;  <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> ,  <code>=======</code>  &icy;  <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code> . &CHcy;&acy;&scy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&dcy;  <code>=======</code>  &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy;&acy;&shcy;&iecy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ocy;&jcy;, &acy; &chcy;&acy;&scy;&tcy;&softcy; &pcy;&ocy;&scy;&lcy;&iecy; &mdash; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &icy;&khcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ocy;&jcy;.</span></p> <p><span data-i18n="40089dac7d3893f1c5ea881c576e369742cd398d48491f121bc84ac7e59c9114/ca" data-source="The default format does not show what the original said in the conflicting area. You cannot tell how many lines are deleted and replaced with Barbie&amp;rsquo;s remark on your side. The only thing you can tell is that your side wants to say it is hard and you&amp;rsquo;d prefer to go shopping, while the other side wants to claim it is easy." onmousemove="i18n(this)">&Fcy;&ocy;&rcy;&mcy;&acy;&tcy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &ncy;&iecy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&iecy;&tcy; &tcy;&ocy;, &chcy;&tcy;&ocy; &gcy;&ocy;&vcy;&ocy;&rcy;&icy;&lcy;&ocy;&scy;&softcy; &vcy; &ocy;&rcy;&icy;&gcy;&icy;&ncy;&acy;&lcy;&iecy; &vcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&jcy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&icy;. &Vcy;&ycy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;, &scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &scy;&tcy;&rcy;&ocy;&kcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ocy; &icy; &zcy;&acy;&mcy;&iecy;&ncy;&iecy;&ncy;&ocy; &zcy;&acy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&iecy;&mcy; &Bcy;&acy;&rcy;&bcy;&icy; &scy; &vcy;&acy;&shcy;&iecy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ycy;. &IEcy;&dcy;&icy;&ncy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy;&iecy;, &chcy;&tcy;&ocy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;, &ecy;&tcy;&ocy; &tcy;&ocy;, &chcy;&tcy;&ocy; &vcy;&acy;&shcy;&acy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&acy; &khcy;&ocy;&chcy;&iecy;&tcy; &scy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;, &chcy;&tcy;&ocy; &ecy;&tcy;&ocy; &scy;&lcy;&ocy;&zhcy;&ncy;&ocy;, &icy; &vcy;&ycy; &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&chcy;&icy;&tcy;&acy;&iecy;&tcy;&iecy; &khcy;&ocy;&dcy;&icy;&tcy;&softcy; &pcy;&ocy; &mcy;&acy;&gcy;&acy;&zcy;&icy;&ncy;&acy;&mcy;, &vcy; &tcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &kcy;&acy;&kcy; &dcy;&rcy;&ucy;&gcy;&acy;&yacy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&acy; &khcy;&ocy;&chcy;&iecy;&tcy; &ucy;&tcy;&vcy;&iecy;&rcy;&zhcy;&dcy;&acy;&tcy;&softcy;, &chcy;&tcy;&ocy; &ecy;&tcy;&ocy; &lcy;&iecy;&gcy;&kcy;&ocy;.</span></p> <p><span data-i18n="09dc7292ed8746834f4edc0d8ef2ff426e00b0c95cb4f21f8195448ae093f220/03" data-source="An alternative style can be used by setting the &lt;code&gt;merge.conflictStyle&lt;/code&gt; configuration variable to either &amp;quot;diff3&amp;quot; or &amp;quot;zdiff3&amp;quot;. In &amp;quot;diff3&amp;quot; style, the above conflict may look like this:" onmousemove="i18n(this)">&Acy;&lcy;&softcy;&tcy;&iecy;&rcy;&ncy;&acy;&tcy;&icy;&vcy;&ncy;&ycy;&jcy; &scy;&tcy;&icy;&lcy;&softcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;, &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&vcy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.conflictStyle</code>  &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;diff3&quot;  &icy;&lcy;&icy;  &quot;zdiff3&quot; . &Vcy; &scy;&tcy;&icy;&lcy;&iecy;  &quot;diff3&quot;  &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&iecy;&ncy;&ncy;&ycy;&jcy; &vcy;&ycy;&shcy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&ycy;&gcy;&lcy;&yacy;&dcy;&iecy;&tcy;&softcy; &tcy;&acy;&kcy;:</span></p> <div> <div> <pre class="hljs language-vbnet">Here are lines that are either unchanged <span class="hljs-keyword">from</span> the common
ancestor, <span class="hljs-built_in">or</span> cleanly resolved because only one side changed,
&lt;&lt;&lt;&lt;&lt;&lt;&lt; yours:sample.txt
<span class="hljs-built_in">or</span> cleanly resolved because both sides changed the same way.
Conflict resolution <span class="hljs-built_in">is</span> hard;
<span class="hljs-keyword">let</span><span class="hljs-comment">&apos;s go shopping.</span>
||||||| base:sample.txt
<span class="hljs-built_in">or</span> cleanly resolved because both sides changed identically.
Conflict resolution <span class="hljs-built_in">is</span> hard.
=======
<span class="hljs-built_in">or</span> cleanly resolved because both sides changed the same way.
Git makes conflict resolution easy.
&gt;&gt;&gt;&gt;&gt;&gt;&gt; theirs:sample.txt
<span class="hljs-built_in">And</span> here <span class="hljs-built_in">is</span> another line that <span class="hljs-built_in">is</span> cleanly resolved <span class="hljs-built_in">or</span> unmodified.</pre> </div> </div> <p><span data-i18n="6ce38bedf4fb0f8c7e6fe35ddc206e22c8d8a4555b710b7bbb199463c2f3a1cd/c8" data-source="while in &amp;quot;zdiff3&amp;quot; style, it may look like this:" onmousemove="i18n(this)">&acy; &vcy; &scy;&tcy;&icy;&lcy;&iecy;  &quot;zdiff3&quot;  &ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&ycy;&gcy;&lcy;&yacy;&dcy;&iecy;&tcy;&softcy; &tcy;&acy;&kcy;:</span></p> <div> <div> <pre class="hljs language-vbnet">Here are lines that are either unchanged <span class="hljs-keyword">from</span> the common
ancestor, <span class="hljs-built_in">or</span> cleanly resolved because only one side changed,
<span class="hljs-built_in">or</span> cleanly resolved because both sides changed the same way.
&lt;&lt;&lt;&lt;&lt;&lt;&lt; yours:sample.txt
Conflict resolution <span class="hljs-built_in">is</span> hard;
<span class="hljs-keyword">let</span><span class="hljs-comment" title="&apos;s go shopping.">&pcy;&ocy;&jcy;&dcy;&iecy;&mcy; &zcy;&acy; &pcy;&ocy;&kcy;&ucy;&pcy;&kcy;&acy;&mcy;&icy;.</span>
||||||| base:sample.txt
<span class="hljs-built_in">or</span> cleanly resolved because both sides changed identically.
Conflict resolution <span class="hljs-built_in">is</span> hard.
=======
Git makes conflict resolution easy.
&gt;&gt;&gt;&gt;&gt;&gt;&gt; theirs:sample.txt
<span class="hljs-built_in">And</span> here <span class="hljs-built_in">is</span> another line that <span class="hljs-built_in">is</span> cleanly resolved <span class="hljs-built_in">or</span> unmodified.</pre> </div> </div> <p><span data-i18n="4729e228a74a6d2fd4bbdc19886ff30a98d629d056bf462cc0659a3bc4cc8eb7/bf" data-source="In addition to the &lt;code&gt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&lt;/code&gt;, &lt;code&gt;=======&lt;/code&gt;, and &lt;code&gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&lt;/code&gt; markers, it uses another &lt;code&gt;|||||||&lt;/code&gt; marker that is followed by the original text. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude. You can sometimes come up with a better resolution by viewing the original." onmousemove="i18n(this)">&Pcy;&ocy;&mcy;&icy;&mcy;&ocy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ocy;&vcy;  <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> ,  <code>=======</code>  &icy;  <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code> , &ocy;&ncy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &iecy;&shchcy;&iecy; &ocy;&dcy;&icy;&ncy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;  <code>|||||||</code> , &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ycy;&jcy; &tcy;&iecy;&kcy;&scy;&tcy;. &Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;, &chcy;&tcy;&ocy; &ocy;&rcy;&icy;&gcy;&icy;&ncy;&acy;&lcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &kcy;&ocy;&ncy;&scy;&tcy;&acy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&lcy; &fcy;&acy;&kcy;&tcy;, &acy; &vcy;&acy;&shcy;&acy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&acy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &pcy;&ocy;&dcy;&dcy;&acy;&lcy;&acy;&scy;&softcy; &ecy;&tcy;&ocy;&mcy;&ucy; &ucy;&tcy;&vcy;&iecy;&rcy;&zhcy;&dcy;&iecy;&ncy;&icy;&yucy; &icy; &scy;&dcy;&acy;&lcy;&acy;&scy;&softcy;, &vcy; &tcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &kcy;&acy;&kcy; &dcy;&rcy;&ucy;&gcy;&acy;&yacy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&acy; &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&lcy;&acy;&scy;&softcy; &zcy;&acy;&ncy;&yacy;&tcy;&softcy; &bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&ocy;&zcy;&icy;&tcy;&icy;&vcy;&ncy;&ucy;&yucy; &pcy;&ocy;&zcy;&icy;&tscy;&icy;&yucy;. &Icy;&ncy;&ocy;&gcy;&dcy;&acy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ncy;&acy;&jcy;&tcy;&icy; &lcy;&ucy;&chcy;&shcy;&iecy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&iecy;, &pcy;&rcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&iecy;&vcy; &ocy;&rcy;&icy;&gcy;&icy;&ncy;&acy;&lcy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_how_to_resolve_conflicts"><span data-i18n="f2456e79e49429220863525685d85eec1b96dfaf354d1135d6d0f61f71c4e18d/f5" data-source="How to resolve conflicts" onmousemove="i18n(this)">&Kcy;&acy;&kcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;</span></h2> <div> <p><span data-i18n="97d6f1b2a60c454facc25d20d55a2f892b6d9a2c256a1d0c22aca4d1a12d8b23/fb" data-source="After seeing a conflict, you can do two things:" onmousemove="i18n(this)">&Ucy;&vcy;&icy;&dcy;&iecy;&vcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&dcy;&iecy;&lcy;&acy;&tcy;&softcy; &dcy;&vcy;&iecy; &vcy;&iecy;&shchcy;&icy;:</span></p> <div> <ul> <li> <p><span data-i18n="2e5ebecce8338e03f85efa15fa8dad58e674ae1a3df4b9a952fd8646afcd2383/5e" data-source="Decide not to merge. The only clean-ups you need are to reset the index file to the &lt;code&gt;HEAD&lt;/code&gt; commit to reverse 2. and to clean up working tree changes made by 2. and 3.; &lt;code&gt;git merge --abort&lt;/code&gt; can be used for this." onmousemove="i18n(this)">&Rcy;&iecy;&shcy;&acy;&iecy;&mcy; &ncy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&tcy;&softcy;&scy;&yacy;. &IEcy;&dcy;&icy;&ncy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&iecy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ycy;&iecy; &ocy;&chcy;&icy;&scy;&tcy;&kcy;&icy; &mdash; &ecy;&tcy;&ocy; &scy;&bcy;&rcy;&ocy;&scy;&icy;&tcy;&softcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ncy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy; &dcy;&ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;  <code>HEAD</code>  &dcy;&lcy;&yacy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;&gcy;&ocy; 2. &icy; &ocy;&chcy;&icy;&scy;&tcy;&icy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;, &scy;&dcy;&iecy;&lcy;&acy;&ncy;&ncy;&ycy;&iecy; 2. &icy; 3.; &Dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>git merge --abort</code> .</span></p> </li> <li> <p><span data-i18n="bf73c8cd1f6a6e14594ec31c4b109139cce3e11124e8772c82e8259bbea88a7c/d7" data-source="Resolve the conflicts. Git will mark the conflicts in the working tree. Edit the files into shape and &lt;code&gt;git add&lt;/code&gt; them to the index. Use &lt;code&gt;git commit&lt;/code&gt; or &lt;code&gt;git merge --continue&lt;/code&gt; to seal the deal. The latter command checks whether there is a (interrupted) merge in progress before calling &lt;code&gt;git commit&lt;/code&gt;." onmousemove="i18n(this)">&Rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;.  Git  &bcy;&ucy;&dcy;&iecy;&tcy; &ocy;&tcy;&mcy;&iecy;&chcy;&acy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;. &Ocy;&tcy;&rcy;&iecy;&dcy;&acy;&kcy;&tcy;&icy;&rcy;&ucy;&jcy;&tcy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy; &fcy;&ocy;&rcy;&mcy;&ucy; &icy;  <code>git add</code>  &vcy;&ncy;&iecy;&scy;&icy;&tcy;&iecy; &icy;&khcy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;. &Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>git commit</code>  &icy;&lcy;&icy;  <code>git merge --continue</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &zcy;&acy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &scy;&dcy;&iecy;&lcy;&kcy;&ucy;. &Pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&yacy;&yacy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&iecy;&tcy;, &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&dcy;&icy;&tcy; &lcy;&icy; (&pcy;&rcy;&iecy;&rcy;&vcy;&acy;&ncy;&ncy;&ocy;&iecy;) &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&dcy; &vcy;&ycy;&zcy;&ocy;&vcy;&ocy;&mcy;  <code>git commit</code> .</span></p> </li> </ul> </div> <p><span data-i18n="4525cfcc212e68f2d960862fcee19d37a3d0a3f7e382a7765535ec5a142e72f8/75" data-source="You can work through the conflict with a number of tools:" onmousemove="i18n(this)">&Rcy;&acy;&zcy;&ocy;&bcy;&rcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &rcy;&yacy;&dcy;&acy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy;:</span></p> <div> <ul> <li> <p><span data-i18n="89cfb31e69e6bd6e8b3a0d10e7a1088bc5551b09c1d8316e097506cf6ccd3eb0/7c" data-source="Use a mergetool. &lt;code&gt;git mergetool&lt;/code&gt; to launch a graphical mergetool which will work through the merge with you." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.  <code>git mergetool</code>  &dcy;&lcy;&yacy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy; &gcy;&rcy;&acy;&fcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &bcy;&ucy;&dcy;&iecy;&tcy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&tcy;&softcy; &scy; &vcy;&acy;&mcy;&icy; &chcy;&iecy;&rcy;&iecy;&zcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;.</span></p> </li> <li> <p><span data-i18n="a01529ce534b7852cb4ca97ae9d0d440c5c0b4c59c3d2ac337b6be7c7bd6631a/b0" data-source="Look at the diffs. &lt;code&gt;git diff&lt;/code&gt; will show a three-way diff, highlighting changes from both the &lt;code&gt;HEAD&lt;/code&gt; and &lt;code&gt;MERGE_HEAD&lt;/code&gt; versions. &lt;code&gt;git diff AUTO_MERGE&lt;/code&gt; will show what changes you&amp;rsquo;ve made so far to resolve textual conflicts." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&icy;&tcy;&iecy; &ncy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy;.  <code>git diff</code>  &pcy;&ocy;&kcy;&acy;&zhcy;&iecy;&tcy; &tcy;&rcy;&iecy;&khcy;&khcy;&ocy;&dcy;&ocy;&vcy;&ocy;&jcy; &dcy;&icy;&fcy;&fcy;&iecy;&rcy;&iecy;&ncy;&tscy;&icy;&acy;&lcy;, &pcy;&ocy;&dcy;&chcy;&iecy;&rcy;&kcy;&icy;&vcy;&acy;&yucy;&shchcy;&icy;&jcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yucy; &scy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;&mcy;&icy;  <code>HEAD</code>  &icy;  <code>MERGE_HEAD</code> .  <code>git diff AUTO_MERGE</code>  &pcy;&ocy;&kcy;&acy;&zhcy;&iecy;&tcy;, &kcy;&acy;&kcy;&icy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy;&ycy; &ucy;&zhcy;&iecy; &vcy;&ncy;&iecy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;.</span></p> </li> <li> <p><span data-i18n="c8bd10c737fb6dd9e66c0a78498e2801958a37cc954d5e6cc9db3138d6e65fbf/3a" data-source="Look at the diffs from each branch. &lt;code&gt;git log --merge -p &amp;lt;path&amp;gt;&lt;/code&gt; will show diffs first for the &lt;code&gt;HEAD&lt;/code&gt; version and then the &lt;code&gt;MERGE_HEAD&lt;/code&gt; version." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&icy;&tcy;&iecy; &ncy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy; &vcy; &kcy;&acy;&zhcy;&dcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&iecy;.  <code>git log --merge -p &lt;path&gt;</code>  &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &pcy;&ocy;&kcy;&acy;&zhcy;&iecy;&tcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy; &dcy;&lcy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&icy;  <code>HEAD</code> , &acy; &zcy;&acy;&tcy;&iecy;&mcy; &dcy;&lcy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&icy;  <code>MERGE_HEAD</code> .</span></p> </li> <li> <p><span data-i18n="1b15f8021a3826be2afe555ecb33cc23bc0cf8d84d9ec1328488942eb7c303b7/2f" data-source="Look at the originals. &lt;code&gt;git show :1:filename&lt;/code&gt; shows the common ancestor, &lt;code&gt;git show :2:filename&lt;/code&gt; shows the &lt;code&gt;HEAD&lt;/code&gt; version, and &lt;code&gt;git show :3:filename&lt;/code&gt; shows the &lt;code&gt;MERGE_HEAD&lt;/code&gt; version." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&icy;&tcy;&iecy; &ocy;&rcy;&icy;&gcy;&icy;&ncy;&acy;&lcy;&ycy;.  <code>git show :1:filename</code>  &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;,  <code>git show :2:filename</code>  &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &vcy;&iecy;&rcy;&scy;&icy;&yucy;  <code>HEAD</code> , &acy;  <code>git show :3:filename</code>  &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &vcy;&iecy;&rcy;&scy;&icy;&yucy;  <code>MERGE_HEAD</code> .</span></p> </li> </ul> </div> </div> <h2 class="text-body-emphasis"  id="_examples"><span data-i18n="e68ee04dff59551b7d1ae07a2f8a00dc61d841628948da3d2781630706a05e92/38" data-source="Examples" onmousemove="i18n(this)">Examples</span></h2> <div> <div> <ul> <li> <p><span data-i18n="bbbad7493c92dd25346ae347d69ac879087aabe35393975c6bb3f49b916ea7b7/56" data-source="Merge branches &lt;code&gt;fixes&lt;/code&gt; and &lt;code&gt;enhancements&lt;/code&gt; on top of the current branch, making an octopus merge:" onmousemove="i18n(this)">&Ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy;  <code>fixes</code>  &icy;  <code>enhancements</code>  &pcy;&ocy;&vcy;&iecy;&rcy;&khcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;, &scy;&ocy;&zcy;&dcy;&acy;&vcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&iecy; &ocy;&scy;&softcy;&mcy;&icy;&ncy;&ocy;&gcy;&acy;:</span></p> <div> <div> <pre class="hljs language-ruby"><span class="hljs-variable">$ </span>git merge fixes enhancements</pre> </div> </div> </li> <li> <p><span data-i18n="f6611ca148ee6815ae8d94e01c88e7cb49f3cdc060f0722cf794b85c6c58a9ca/0d" data-source="Merge branch &lt;code&gt;obsolete&lt;/code&gt; into the current branch, using &lt;code&gt;ours&lt;/code&gt; merge strategy:" onmousemove="i18n(this)">&Ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &vcy;&iecy;&tcy;&kcy;&ucy;  <code>obsolete</code>  &scy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&ocy;&jcy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  <code>ours</code> :</span></p> <div> <div> <pre class="hljs language-ruby"><span class="hljs-variable">$ </span>git merge -s ours obsolete</pre> </div> </div> </li> <li> <p><span data-i18n="642f09897e5f60422cd950a03b253a7d026c8c82e76451fe4f2ac75df56b9102/2a" data-source="Merge branch &lt;code&gt;maint&lt;/code&gt; into the current branch, but do not make a new commit automatically:" onmousemove="i18n(this)">&Ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy; &vcy;&iecy;&tcy;&kcy;&ucy;  <code>maint</code>  &scy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&ocy;&jcy;, &ncy;&ocy; &ncy;&iecy; &dcy;&iecy;&lcy;&acy;&jcy;&tcy;&iecy; &ncy;&ocy;&vcy;&ycy;&jcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;:</span></p> <div> <div> <pre class="hljs language-sql">$ git <span class="hljs-keyword">merge</span> <span class="hljs-comment">--no-commit maint</span></pre> </div> </div> <p><span data-i18n="4b5e130e2bfb4d479952ba7a9d297bd72cb487499b3fd1dd95e727d879fa9f08/e1" data-source="This can be used when you want to include further changes to the merge, or want to write your own merge commit message." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &icy;&lcy;&icy; &ncy;&acy;&pcy;&icy;&scy;&acy;&tcy;&softcy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="54a467bb93c7c44d9938b73c0685755bd62a10cc7bc2f169536c5ee2d18c7ae5/e8" data-source="You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping release/version name would be acceptable." onmousemove="i18n(this)">&Vcy;&acy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &vcy;&ocy;&zcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &ocy;&tcy; &zcy;&lcy;&ocy;&ucy;&pcy;&ocy;&tcy;&rcy;&iecy;&bcy;&lcy;&iecy;&ncy;&icy;&yacy; &ecy;&tcy;&ocy;&jcy; &ocy;&pcy;&tscy;&icy;&iecy;&jcy; &dcy;&lcy;&yacy; &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&icy;&yacy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &vcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ncy;&iecy;&bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;, &tcy;&acy;&kcy;&icy;&iecy; &kcy;&acy;&kcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&iecy; &ncy;&acy;&zcy;&vcy;&acy;&ncy;&icy;&yacy; &vcy;&ycy;&pcy;&ucy;&scy;&kcy;&acy;/&vcy;&iecy;&rcy;&scy;&icy;&icy;, &bcy;&ucy;&dcy;&ucy;&tcy; &pcy;&rcy;&icy;&iecy;&mcy;&lcy;&iecy;&mcy;&ycy;&mcy;&icy;.</span></p> </li> </ul> </div> </div> <h2 class="text-body-emphasis"  id="_merge_strategies"><span data-i18n="f04f3abcca95c9c7aa9e8b0f221378af0eab4b2532396aa67123b38dd352f50b/7b" data-source="Merge strategies" onmousemove="i18n(this)">Merge strategies</span></h2> <div> <p><span data-i18n="4bd0d99df37329f0d1b26b0428ed1b55bc023123327f3d2a798acaa22c506fab/72" data-source="The merge mechanism (&lt;code&gt;git merge&lt;/code&gt; and &lt;code&gt;git pull&lt;/code&gt; commands) allows the backend &lt;code&gt;merge strategies&lt;/code&gt; to be chosen with &lt;code&gt;-s&lt;/code&gt; option. Some strategies can also take their own options, which can be passed by giving &lt;code&gt;-X&amp;lt;option&amp;gt;&lt;/code&gt; arguments to &lt;code&gt;git merge&lt;/code&gt; and/or &lt;code&gt;git pull&lt;/code&gt;." onmousemove="i18n(this)">&Mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; (&kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  <code>git merge</code>  &icy;  <code>git pull</code> ) &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &vcy;&ycy;&bcy;&icy;&rcy;&acy;&tcy;&softcy; &scy;&iecy;&rcy;&vcy;&iecy;&rcy;&ncy;&ucy;&yucy; &chcy;&acy;&scy;&tcy;&softcy;  <code>merge strategies</code>  &scy; &ocy;&pcy;&tscy;&icy;&iecy;&jcy;  <code>-s</code> . &Ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy; &tcy;&acy;&kcy;&zhcy;&iecy; &mcy;&ocy;&gcy;&ucy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &scy;&vcy;&ocy;&icy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&iecy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&tcy;&softcy;, &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&vcy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ycy;  <code>-X&lt;option&gt;</code>  &vcy;  <code>git merge</code>  &icy;/&icy;&lcy;&icy;  <code>git pull</code> .</span></p> <div> <dl> <dt id="Documentation/git-merge.txt-ort"><span data-i18n="8273ef957736e504caa03e5ef80f29bb0e8c81916d935cf1c8aabcc408221650/eb" data-source="ort" onmousemove="i18n(this)">ort</span></dt> <dd> <p><span data-i18n="d46c624879a92ad901eade11f44f5602006ea4993e80d1a464aa4fd92fc7dbd0/f1" data-source="This is the default merge strategy when pulling or merging one branch. This strategy can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this strategy can detect and handle merges involving renames. It does not make use of detected copies. The name for this algorithm is an acronym (&amp;quot;Ostensibly Recursive&amp;rsquo;s Twin&amp;quot;) and came from the fact that it was written as a replacement for the previous default algorithm, &lt;code&gt;recursive&lt;/code&gt;." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &pcy;&rcy;&icy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy; &icy;&lcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy; &ocy;&dcy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;. &Ecy;&tcy;&acy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &mcy;&ocy;&zhcy;&iecy;&tcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &dcy;&vcy;&iecy; &gcy;&ocy;&lcy;&ocy;&vcy;&ycy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &IEcy;&scy;&lcy;&icy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&ocy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &ocy;&bcy;&shchcy;&icy;&khcy; &pcy;&rcy;&iecy;&dcy;&kcy;&ocy;&vcy; &icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &ecy;&tcy;&acy;&lcy;&ocy;&ncy;&ncy;&ocy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &dcy;&lcy;&yacy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Scy;&ocy;&ocy;&bcy;&shchcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &ecy;&tcy;&ocy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &mcy;&iecy;&ncy;&softcy;&shcy;&iecy;&mcy;&ucy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&ucy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &ncy;&iecy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&yacy; &ncy;&iecy;&pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&ycy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;, &scy;&ocy;&gcy;&lcy;&acy;&scy;&ncy;&ocy; &tcy;&iecy;&scy;&tcy;&acy;&mcy;, &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&ncy;&ycy;&mcy; &ncy;&acy; &rcy;&iecy;&acy;&lcy;&softcy;&ncy;&ycy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &vcy;&zcy;&yacy;&tcy;&ycy;&khcy; &icy;&zcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&icy; &yacy;&dcy;&rcy;&acy; Linux 2.6. &Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &ecy;&tcy;&acy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&vcy;&acy;&tcy;&softcy; &icy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ncy;&ycy;&iecy; &scy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;&mcy;&icy;. &Ocy;&ncy; &ncy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&ncy;&ycy;&iecy; &kcy;&ocy;&pcy;&icy;&icy;. &Ncy;&acy;&zcy;&vcy;&acy;&ncy;&icy;&iecy; &ecy;&tcy;&ocy;&gcy;&ocy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy;&acy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &acy;&bcy;&bcy;&rcy;&iecy;&vcy;&icy;&acy;&tcy;&ucy;&rcy;&ocy;&jcy; ( &quot;Ostensibly Recursive&rsquo;s Twin&quot; ) &icy; &pcy;&rcy;&ocy;&icy;&zcy;&ocy;&shcy;&lcy;&ocy; &ocy;&tcy; &tcy;&ocy;&gcy;&ocy;, &chcy;&tcy;&ocy; &ocy;&ncy; &bcy;&ycy;&lcy; &ncy;&acy;&pcy;&icy;&scy;&acy;&ncy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &zcy;&acy;&mcy;&iecy;&ncy;&ycy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy;&acy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>recursive</code> .</span></p> <p><span data-i18n="9e5d6b138b850f15ca2bb831d39a4544dfd1018479c7a5b2498b1dce46ea3508/e2" data-source="The &lt;code&gt;ort&lt;/code&gt; strategy can take the following options:" onmousemove="i18n(this)">&Scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy;  <code>ort</code>  &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&tcy;&softcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&iecy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;&ycy;:</span></p> <div> <dl> <dt id="Documentation/git-merge.txt-ours"><span data-i18n="ae0bec9e9d33c56354bd612c8a6010840324fc5b9786ce0a18b696b304b09397/e0" data-source="ours" onmousemove="i18n(this)">ours</span></dt> <dd> <p><span data-i18n="65974079a399b218b3edde13a155a766522e5897c5c98be644dde60df760f868/f1" data-source="This option forces conflicting hunks to be auto-resolved cleanly by favoring &lt;code&gt;our&lt;/code&gt; version. Changes from the other tree that do not conflict with our side are reflected in the merge result. For a binary file, the entire contents are taken from our side." onmousemove="i18n(this)">&Ecy;&tcy;&acy; &ocy;&pcy;&tscy;&icy;&yacy; &zcy;&acy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&iecy; &fcy;&rcy;&acy;&gcy;&mcy;&iecy;&ncy;&tcy;&ycy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&tcy;&softcy;&scy;&yacy;, &ocy;&tcy;&dcy;&acy;&vcy;&acy;&yacy; &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&chcy;&tcy;&iecy;&ncy;&icy;&iecy; &vcy;&iecy;&rcy;&scy;&icy;&icy;  <code>our</code> . &Icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&zcy; &dcy;&rcy;&ucy;&gcy;&ocy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&tcy; &scy; &ncy;&acy;&shcy;&iecy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ocy;&jcy;, &ocy;&tcy;&rcy;&acy;&zhcy;&acy;&yucy;&tcy;&scy;&yacy; &vcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Dcy;&lcy;&yacy; &bcy;&icy;&ncy;&acy;&rcy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &vcy;&scy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &bcy;&iecy;&rcy;&iecy;&tcy;&scy;&yacy; &scy; &ncy;&acy;&shcy;&iecy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ycy;.</span></p> <p><span data-i18n="c9b7c7d995df05185f3e0f5dd8b6ea4ad9f636e1cd149e7ec0df871980d4c271/51" data-source="This should not be confused with the &lt;code&gt;ours&lt;/code&gt; merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring &lt;code&gt;our&lt;/code&gt; history contains all that happened in it." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &ncy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &pcy;&ucy;&tcy;&acy;&tcy;&softcy; &scy;&ocy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&iecy;&jcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  <code>ours</code> , &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &vcy;&ocy;&ocy;&bcy;&shchcy;&iecy; &ncy;&iecy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;. &Ocy;&ncy; &ocy;&tcy;&bcy;&rcy;&acy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &vcy;&scy;&iecy;, &chcy;&tcy;&ocy; &scy;&dcy;&iecy;&lcy;&acy;&lcy;&ocy; &dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy;, &ocy;&bcy;&hardcy;&yacy;&vcy;&lcy;&yacy;&yacy;, &chcy;&tcy;&ocy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy;  <code>our</code>  &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &vcy;&scy;&iecy;, &chcy;&tcy;&ocy; &vcy; &ncy;&iecy;&jcy; &pcy;&rcy;&ocy;&icy;&zcy;&ocy;&shcy;&lcy;&ocy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-theirs"><span data-i18n="4c55a8552a2c7261f61f798c2265e6f13358f326ae5b934096ff16bd15e62c33/01" data-source="theirs" onmousemove="i18n(this)">theirs</span></dt> <dd> <p><span data-i18n="26f1473b2b17d9a2405a600365678097fb4355099ea9959b4a61d79d5e924d66/65" data-source="This is the opposite of &lt;code&gt;ours&lt;/code&gt;; note that, unlike &lt;code&gt;ours&lt;/code&gt;, there is no &lt;code&gt;theirs&lt;/code&gt; merge strategy to confuse this merge option with." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ocy;&pcy;&ocy;&lcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy;  <code>ours</code> ; &ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy;, &vcy; &ocy;&tcy;&lcy;&icy;&chcy;&icy;&iecy; &ocy;&tcy;  <code>ours</code> , &ncy;&iecy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  <code>theirs</code> , &scy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&jcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ycy;&lcy;&ocy; &bcy;&ycy; &scy;&pcy;&ucy;&tcy;&acy;&tcy;&softcy; &ecy;&tcy;&ocy;&tcy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-ignore-space-change"><span data-i18n="273196c9bd7f9ae458abbff9dcc1dddc0270e1c86fdb7200c5e81f016032ed90/e2" data-source="ignore-space-change" onmousemove="i18n(this)">ignore-space-change</span></dt> <dt id="Documentation/git-merge.txt-ignore-all-space"><span data-i18n="2eea45de972e4529e198572eba59078d67af8251f0a0e169aaa42ea54b4ae40a/23" data-source="ignore-all-space" onmousemove="i18n(this)">ignore-all-space</span></dt> <dt id="Documentation/git-merge.txt-ignore-space-at-eol"><span data-i18n="ce73c9bb81f03bcdc6361adfbc3237e282ec86ed5d9109a9cc86249a18ebb6dc/c8" data-source="ignore-space-at-eol" onmousemove="i18n(this)">ignore-space-at-eol</span></dt> <dt id="Documentation/git-merge.txt-ignore-cr-at-eol"><span data-i18n="aaa80055d4603b1d7303f80194bba7af7dac800349209bd0312caf9f91a5217f/04" data-source="ignore-cr-at-eol" onmousemove="i18n(this)">ignore-cr-at-eol</span></dt> <dd> <p> <span data-i18n="e3579b62a511ac1d752a1f5a168e704dc6466e2b5dace8fd51ee28167e8adacb/38" data-source="Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also &lt;a href=&quot;git-diff&quot;&gt;git-diff[1]&lt;/a&gt;&lt;code&gt;-b&lt;/code&gt;, &lt;code&gt;-w&lt;/code&gt;, &lt;code&gt;--ignore-space-at-eol&lt;/code&gt;, and &lt;code&gt;--ignore-cr-at-eol&lt;/code&gt;." onmousemove="i18n(this)">&Scy;&chcy;&icy;&tcy;&acy;&iecy;&tcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &scy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ycy;&mcy; &tcy;&icy;&pcy;&ocy;&mcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy; &ncy;&iecy;&icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy; &dcy;&lcy;&yacy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy;, &scy;&mcy;&iecy;&shcy;&acy;&ncy;&ncy;&ycy;&iecy; &scy; &dcy;&rcy;&ucy;&gcy;&icy;&mcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;&mcy;&icy; &vcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy;, &ncy;&iecy; &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy;. &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="git-diff.html">git-diff[1]</a> ,  <code>-b</code> ,  <code>-w</code> ,  <code>--ignore-space-at-eol</code>  &icy;  <code>--ignore-cr-at-eol</code> .</span></p> <div> <ul> <li> <p><span data-i18n="59b00965fc27019281d4fe1b3f4970262fb6c294b53759f198e21c76b350fa03/8f" data-source="If &lt;code&gt;their&lt;/code&gt; version only introduces whitespace changes to a line, &lt;code&gt;our&lt;/code&gt; version is used;" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;  <code>their</code>  &vcy;&vcy;&ocy;&dcy;&icy;&tcy; &vcy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;  <code>our</code> ;</span></p> </li> <li> <p><span data-i18n="1ed53308feac0fdae48bc15fa01578338c087b2e7eaf5f9c1f2e6bc8675baa0b/2c" data-source="If &lt;code&gt;our&lt;/code&gt; version introduces whitespace changes but &lt;code&gt;their&lt;/code&gt; version includes a substantial change, &lt;code&gt;their&lt;/code&gt; version is used;" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;  <code>our</code>  &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&acy;&khcy;, &acy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;  <code>their</code>  &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;  <code>their</code> ;</span></p> </li> <li> <p><span data-i18n="b40faf0106beb2527aaed2fa5bea6e363bd21c08e91304803a2637ba4e4568fc/1d" data-source="Otherwise, the merge proceeds in the usual way." onmousemove="i18n(this)">&Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&dcy;&icy;&tcy; &ocy;&bcy;&ycy;&chcy;&ncy;&ycy;&mcy; &scy;&pcy;&ocy;&scy;&ocy;&bcy;&ocy;&mcy;.</span></p> </li> </ul> </div> </dd> <dt id="Documentation/git-merge.txt-renormalize"><span data-i18n="5f5058ebf63f2bbf2fc76358b2a64fd6e115ac1f79cf92524657a1b3d1c0df4a/8a" data-source="renormalize" onmousemove="i18n(this)">renormalize</span></dt> <dd> <p><span data-i18n="4dbba90a88a937de2d3a096961ea3215002c4af926e7ba139d7e0a814bf90b89/58" data-source="This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge. This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules. See &amp;quot;Merging branches with differing checkin/checkout attributes&amp;quot; in &lt;a href=&quot;gitattributes&quot;&gt;gitattributes[5]&lt;/a&gt; for details." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &ecy;&tcy;&ocy;&mcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy;&icy;&rcy;&tcy;&ucy;&acy;&lcy;&softcy;&ncy;&ocy;&iecy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&iecy; &icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy; &vcy;&scy;&iecy;&khcy; &tcy;&rcy;&iecy;&khcy; &ecy;&tcy;&acy;&pcy;&ocy;&vcy; &fcy;&acy;&jcy;&lcy;&acy; &pcy;&rcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&icy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ecy;&tcy;&acy; &ocy;&pcy;&tscy;&icy;&yacy; &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&acy; &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &pcy;&rcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &scy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&ncy;&ycy;&mcy;&icy; &chcy;&icy;&scy;&tcy;&ycy;&mcy;&icy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&mcy;&icy; &icy;&lcy;&icy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&acy;&mcy;&icy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&icy; &kcy;&ocy;&ncy;&tscy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;. &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy;  &quot;Merging branches with differing checkin/checkout attributes&quot;  &icy;  <a href="gitattributes.html">gitattributes[5]</a> .</span></p> </dd> <dt id="Documentation/git-merge.txt-no-renormalize"><span data-i18n="df1a755d89e7cfa2ca1fb5b6227851676733fa0b007fcf5209f126e1265f1ae5/1d" data-source="no-renormalize" onmousemove="i18n(this)">no-renormalize</span></dt> <dd> <p><span data-i18n="21d657b14d0114d59ad71f9c8c500868dd70140c65b48a3e954bc08856be817d/45" data-source="Disables the &lt;code&gt;renormalize&lt;/code&gt; option. This overrides the &lt;code&gt;merge.renormalize&lt;/code&gt; configuration variable." onmousemove="i18n(this)">&Ocy;&tcy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy; &ocy;&pcy;&tscy;&icy;&yucy;  <code>renormalize</code> . &Ecy;&tcy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.renormalize</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-find-renamesltngt"><span data-i18n="4057dbc1fc03a1e35cfbe15e24db21be63c083b1a9ef8f342defe5350a60741b/eb" data-source="find-renames[=&amp;lt;n&amp;gt;]" onmousemove="i18n(this)">find-renames[=&lt;n&gt;]</span></dt> <dd> <p> <span data-i18n="796f509a49b9fef8a16f4c468e6ce0d27d7023ea173520002ad2f0a6b42ef9dc/08" data-source="Turn on rename detection, optionally setting the similarity threshold. This is the default. This overrides the &lt;code&gt;merge.renames&lt;/code&gt; configuration variable. See also &lt;a href=&quot;git-diff&quot;&gt;git-diff[1]&lt;/a&gt;&lt;code&gt;--find-renames&lt;/code&gt;." onmousemove="i18n(this)">&Vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&iecy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &pcy;&rcy;&icy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&vcy; &pcy;&ocy;&rcy;&ocy;&gcy; &scy;&khcy;&ocy;&dcy;&scy;&tcy;&vcy;&acy;. &Ecy;&tcy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;. &Ecy;&tcy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.renames</code> . &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="git-diff.html">git-diff[1]</a> <code>--find-renames</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-rename-thresholdltngt"><span data-i18n="0047c18a3f806010fe97b4694256ec255d27643be7d4f2a1e43d3f56374ae76a/e5" data-source="rename-threshold=&amp;lt;n&amp;gt;" onmousemove="i18n(this)">rename-threshold=&lt;n&gt;</span></dt> <dd> <p><span data-i18n="7bf6b64fd8763f0d93b31e67cf6cf15e39b2d7dd9d34b32c547a9ba75b1da50a/93" data-source="Deprecated synonym for &lt;code&gt;find-renames=&amp;lt;n&amp;gt;&lt;/code&gt;." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&rcy;&iecy;&vcy;&shcy;&icy;&jcy; &scy;&icy;&ncy;&ocy;&ncy;&icy;&mcy;  <code>find-renames=&lt;n&gt;</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-subtreeltpathgt"><span data-i18n="efb8496fada54cf13d86bceb12430b313034a110e1637aac9057f9a807dce75b/49" data-source="subtree[=&amp;lt;path&amp;gt;]" onmousemove="i18n(this)">subtree[=&lt;path&gt;]</span></dt> <dd> <p><span data-i18n="5d265828b31e50599933b09bdf49081cedba5f7b0e42c53d4ac4847a8d059111/57" data-source="This option is a more advanced form of &lt;code&gt;subtree&lt;/code&gt; strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&bcy;&ocy;&jcy; &bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&rcy;&ocy;&dcy;&vcy;&icy;&ncy;&ucy;&tcy;&ucy;&yucy; &fcy;&ocy;&rcy;&mcy;&ucy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy;  <code>subtree</code> , &gcy;&dcy;&iecy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&iecy;&tcy;, &kcy;&acy;&kcy; &dcy;&vcy;&acy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &scy;&dcy;&vcy;&icy;&ncy;&ucy;&tcy;&ycy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&ncy;&icy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&lcy;&icy; &dcy;&rcy;&ucy;&gcy; &scy; &dcy;&rcy;&ucy;&gcy;&ocy;&mcy; &pcy;&rcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy;. &Vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &kcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&mcy;&ucy; &pcy;&ucy;&tcy;&icy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&rcy;&iecy;&fcy;&icy;&kcy;&scy; (&icy;&lcy;&icy; &ucy;&dcy;&acy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &scy; &scy;&acy;&mcy;&ocy;&gcy;&ocy; &ncy;&acy;&chcy;&acy;&lcy;&acy;), &chcy;&tcy;&ocy;&bcy;&ycy; &fcy;&ocy;&rcy;&mcy;&acy; &dcy;&vcy;&ucy;&khcy; &dcy;&iecy;&rcy;&iecy;&vcy;&softcy;&iecy;&vcy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&lcy;&acy;.</span></p> </dd> </dl> </div> </dd> <dt id="Documentation/git-merge.txt-recursive"><span data-i18n="21ce078705d04ca6324c1d0313fc08ea99f3cef6389a6744d40bd2d9d0cd7816/68" data-source="recursive" onmousemove="i18n(this)">recursive</span></dt> <dd> <p><span data-i18n="23742e697c92a6eaf17173191d248312473b41e07b75c139eeca9c4f32456d31/84" data-source="This can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames. It does not make use of detected copies. This was the default strategy for resolving two heads from Git v0.99.9k until v2.33.0." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&iecy;&tcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &dcy;&vcy;&iecy; &gcy;&ocy;&lcy;&ocy;&vcy;&ycy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &IEcy;&scy;&lcy;&icy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&ocy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &ocy;&bcy;&shchcy;&icy;&khcy; &pcy;&rcy;&iecy;&dcy;&kcy;&ocy;&vcy; &icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &ecy;&tcy;&acy;&lcy;&ocy;&ncy;&ncy;&ocy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &dcy;&lcy;&yacy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Scy;&ocy;&ocy;&bcy;&shchcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &ecy;&tcy;&ocy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &mcy;&iecy;&ncy;&softcy;&shcy;&iecy;&mcy;&ucy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&ucy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &ncy;&iecy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&yacy; &ncy;&iecy;&pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&ycy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;, &scy;&ocy;&gcy;&lcy;&acy;&scy;&ncy;&ocy; &tcy;&iecy;&scy;&tcy;&acy;&mcy;, &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&ncy;&ycy;&mcy; &ncy;&acy; &rcy;&iecy;&acy;&lcy;&softcy;&ncy;&ycy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &vcy;&zcy;&yacy;&tcy;&ycy;&khcy; &icy;&zcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&icy; &yacy;&dcy;&rcy;&acy; Linux 2.6. &Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&vcy;&acy;&tcy;&softcy; &icy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ncy;&ycy;&iecy; &scy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;&mcy;&icy;. &Ocy;&ncy; &ncy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&ncy;&ycy;&iecy; &kcy;&ocy;&pcy;&icy;&icy;. &Ecy;&tcy;&ocy; &bcy;&ycy;&lcy;&acy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &dcy;&lcy;&yacy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &dcy;&vcy;&ucy;&khcy; &gcy;&ocy;&lcy;&ocy;&vcy;&ocy;&kcy; &ocy;&tcy;  Git  v0.99.9k &dcy;&ocy; v2.33.0.</span></p> <p><span data-i18n="35346110008aa623e2810dc1ad4dcb4640d658a75cfc63249445c3b27828d0d9/f4" data-source="The &lt;code&gt;recursive&lt;/code&gt; strategy takes the same options as &lt;code&gt;ort&lt;/code&gt;. However, there are three additional options that &lt;code&gt;ort&lt;/code&gt; ignores (not documented above) that are potentially useful with the &lt;code&gt;recursive&lt;/code&gt; strategy:" onmousemove="i18n(this)">&Scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy;  <code>recursive</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &tcy;&iecy; &zhcy;&iecy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy;, &chcy;&tcy;&ocy; &icy;  <code>ort</code> . &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &iecy;&scy;&tcy;&softcy; &tcy;&rcy;&icy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&khcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy;  <code>ort</code>  &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&iecy;&tcy; (&ncy;&iecy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ycy; &vcy;&ycy;&shcy;&iecy;), &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &pcy;&ocy;&tcy;&iecy;&ncy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ocy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ycy; &dcy;&lcy;&yacy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy;  <code>recursive</code> :</span></p> <div> <dl> <dt id="Documentation/git-merge.txt-patience"><span data-i18n="96d61fe343ddf5e0d8d68b1d0b08b9af50973a0ebdd38021fae327bbea1b4c13/ce" data-source="patience" onmousemove="i18n(this)">patience</span></dt> <dd> <p><span data-i18n="d2a291da10b374741e2b23e9f9572c9c6c77becc4abcc14306d54df1608594d9/1b" data-source="Deprecated synonym for &lt;code&gt;diff-algorithm=patience&lt;/code&gt;." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&rcy;&iecy;&vcy;&shcy;&icy;&jcy; &scy;&icy;&ncy;&ocy;&ncy;&icy;&mcy;  <code>diff-algorithm=patience</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-diff-algorithmpatienceminimalhistogrammyers"><span data-i18n="412149d2f95714e40ca33b280a92e9aa4100af8e0f1da3149493c7f65ea8682d/1f" data-source="diff-algorithm=[patience|minimal|histogram|myers]" onmousemove="i18n(this)">diff-algorithm=[patience|minimal|histogram|myers]</span></dt> <dd> <p> <span data-i18n="59b389c14927368b86cd087acabcc7066910786bf4689b68d4057be7898ca045/7d" data-source="Use a different diff algorithm while merging, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions). See also &lt;a href=&quot;git-diff&quot;&gt;git-diff[1]&lt;/a&gt;&lt;code&gt;--diff-algorithm&lt;/code&gt;. Note that &lt;code&gt;ort&lt;/code&gt; specifically uses &lt;code&gt;diff-algorithm=histogram&lt;/code&gt;, while &lt;code&gt;recursive&lt;/code&gt; defaults to the &lt;code&gt;diff.algorithm&lt;/code&gt; config setting." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&rcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy;, &chcy;&tcy;&ocy; &pcy;&ocy;&mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&zcy;&bcy;&iecy;&zhcy;&acy;&tcy;&softcy; &ocy;&shcy;&icy;&bcy;&ocy;&kcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&acy;&yucy;&shchcy;&icy;&khcy; &icy;&zcy;-&zcy;&acy; &ncy;&iecy;&vcy;&acy;&zhcy;&ncy;&ycy;&khcy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&yucy;&shchcy;&icy;&khcy; &scy;&tcy;&rcy;&ocy;&kcy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &fcy;&icy;&gcy;&ucy;&rcy;&ncy;&ycy;&khcy; &scy;&kcy;&ocy;&bcy;&ocy;&kcy; &icy;&zcy; &rcy;&acy;&zcy;&ncy;&ycy;&khcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&jcy;). &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="git-diff.html">git-diff[1]</a> <code>--diff-algorithm</code> . &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy;  <code>ort</code>  &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;  <code>diff-algorithm=histogram</code> , &acy;  <code>recursive</code>  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&ucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>diff.algorithm</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-no-renames"><span data-i18n="c309ba21929e3539cf3927e16db200150677fa0880e015650b356537482681cd/ff" data-source="no-renames" onmousemove="i18n(this)">no-renames</span></dt> <dd> <p> <span data-i18n="39b3e466197b313b5fe1a4700a90b358dd40e2948427255a29959de2555d1df3/0b" data-source="Turn off rename detection. This overrides the &lt;code&gt;merge.renames&lt;/code&gt; configuration variable. See also &lt;a href=&quot;git-diff&quot;&gt;git-diff[1]&lt;/a&gt;&lt;code&gt;--no-renames&lt;/code&gt;." onmousemove="i18n(this)">&Ocy;&tcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&iecy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;. &Ecy;&tcy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.renames</code> . &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="git-diff.html">git-diff[1]</a> <code>--no-renames</code> .</span></p> </dd> </dl> </div> </dd> <dt id="Documentation/git-merge.txt-resolve"><span data-i18n="fdf09cdfc26cccf610edccd7f9b558e1ce0a793a4ee57f8306df9058f1aa929b/b8" data-source="resolve" onmousemove="i18n(this)">resolve</span></dt> <dd> <p><span data-i18n="399c1d3e2128d1a61cefcc6c10e8d538ab8515c44b2158aa61541448c703f9b7/a1" data-source="This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities. It does not handle renames." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&iecy;&tcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &dcy;&vcy;&iecy; &gcy;&ocy;&lcy;&ocy;&vcy;&ycy; (&tcy;. &iecy;. &tcy;&iecy;&kcy;&ucy;&shchcy;&ucy;&yucy; &vcy;&iecy;&tcy;&vcy;&softcy; &icy; &dcy;&rcy;&ucy;&gcy;&ucy;&yucy; &vcy;&iecy;&tcy;&vcy;&softcy;, &icy;&zcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&jcy; &vcy;&ycy; &icy;&zcy;&vcy;&lcy;&iecy;&kcy;&lcy;&icy;) &scy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;&mcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy;&acy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ocy;&ncy; &pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &tcy;&shchcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&tcy;&softcy; &ncy;&iecy;&ocy;&dcy;&ncy;&ocy;&zcy;&ncy;&acy;&chcy;&ncy;&ocy;&scy;&tcy;&icy; &pcy;&iecy;&rcy;&iecy;&kcy;&rcy;&iecy;&scy;&tcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ocy;&ncy; &ncy;&iecy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-octopus"><span data-i18n="5633c9b8af6d089859afcbec42fdc03f8c407aaba9668218b433bd4959911465/49" data-source="octopus" onmousemove="i18n(this)">octopus</span></dt> <dd> <p><span data-i18n="8baa5b9deb45613ef88030c490de4efc39e1638796822db97cb936ccb34a6079/f6" data-source="This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when pulling or merging more than one branch." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&iecy;&tcy; &scy;&lcy;&ucy;&chcy;&acy;&icy; &scy; &bcy;&ocy;&lcy;&iecy;&iecy; &chcy;&iecy;&mcy; &dcy;&vcy;&ucy;&mcy;&yacy; &gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&acy;&mcy;&icy;, &ncy;&ocy; &ocy;&tcy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&tcy;&softcy; &scy;&lcy;&ocy;&zhcy;&ncy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &tcy;&rcy;&iecy;&bcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy;. &Vcy; &pcy;&iecy;&rcy;&vcy;&ucy;&yucy; &ocy;&chcy;&iecy;&rcy;&iecy;&dcy;&softcy; &ocy;&ncy; &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy; &dcy;&lcy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&yacy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&ocy;&vcy; &tcy;&iecy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;. &Ecy;&tcy;&ocy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &pcy;&rcy;&icy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy; &icy;&lcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &chcy;&iecy;&mcy; &ocy;&dcy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-ours-1"><span data-i18n="ae0bec9e9d33c56354bd612c8a6010840324fc5b9786ce0a18b696b304b09397/e0" data-source="ours" onmousemove="i18n(this)">ours</span></dt> <dd> <p><span data-i18n="9a1e85201b20a75041aa78b447263a7c7c58c2639c886bf09762a1f2aa5e1484/69" data-source="This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. Note that this is different from the -Xours option to the &lt;code&gt;recursive&lt;/code&gt; merge strategy." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &ecy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&iecy;&tcy;&scy;&yacy; &lcy;&yucy;&bcy;&ocy;&iecy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&ocy; &gcy;&ocy;&lcy;&ocy;&vcy;, &ncy;&ocy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&icy;&rcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&scy;&iecy;&gcy;&dcy;&acy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy;&mcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &gcy;&ocy;&lcy;&ocy;&vcy;&ycy; &vcy;&iecy;&tcy;&kcy;&icy;, &ecy;&fcy;&fcy;&iecy;&kcy;&tcy;&icy;&vcy;&ncy;&ocy; &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&yacy; &vcy;&scy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &icy;&zcy; &vcy;&scy;&iecy;&khcy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;. &Ocy;&ncy; &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy; &dcy;&lcy;&yacy; &zcy;&acy;&mcy;&iecy;&ncy;&ycy; &scy;&tcy;&acy;&rcy;&ocy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy; &rcy;&acy;&zcy;&vcy;&icy;&tcy;&icy;&yacy; &pcy;&ocy;&bcy;&ocy;&chcy;&ncy;&ycy;&khcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;. &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &ecy;&tcy;&ocy; &ocy;&tcy;&lcy;&icy;&chcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&tcy; &ocy;&pcy;&tscy;&icy;&icy; -Xours &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  <code>recursive</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-subtree"><span data-i18n="0a0369a8dc42658354e0c10425f84a0c95226ba213f2cf571cc056cb757434a2/ec" data-source="subtree" onmousemove="i18n(this)">subtree</span></dt> <dd> <p><span data-i18n="4baa78badb197133e827b45bbaf6145c28a9f65d3d4a526261199ae13faaf0be/ec" data-source="This is a modified &lt;code&gt;ort&lt;/code&gt; strategy. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &mcy;&ocy;&dcy;&icy;&fcy;&icy;&tscy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&acy;&yacy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy;  <code>ort</code> . &Pcy;&rcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy; &dcy;&iecy;&rcy;&iecy;&vcy;&softcy;&iecy;&vcy; A &icy; B, &iecy;&scy;&lcy;&icy; B &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&iecy;&vcy;&ucy; A, B &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &ncy;&acy;&scy;&tcy;&rcy;&acy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &tcy;&acy;&kcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&ncy;&ocy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&lcy;&ocy; &dcy;&rcy;&iecy;&vcy;&ocy;&vcy;&icy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ucy;&kcy;&tcy;&ucy;&rcy;&iecy; A, &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &chcy;&tcy;&iecy;&ncy;&icy;&yacy; &dcy;&iecy;&rcy;&iecy;&vcy;&softcy;&iecy;&vcy; &ncy;&acy; &ocy;&dcy;&ncy;&ocy;&mcy; &ucy;&rcy;&ocy;&vcy;&ncy;&iecy;. &Ecy;&tcy;&acy; &kcy;&ocy;&rcy;&rcy;&iecy;&kcy;&tcy;&icy;&rcy;&ocy;&vcy;&kcy;&acy; &tcy;&acy;&kcy;&zhcy;&iecy; &vcy;&ncy;&ocy;&scy;&icy;&tcy;&scy;&yacy; &vcy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;.</span></p> </dd> </dl> </div> <p><span data-i18n="9169821fddf88965e9cb12645db382d477ac771fcf54a57f25f04a48b7dfd2b7/f2" data-source="With the strategies that use 3-way merge (including the default, &lt;code&gt;ort&lt;/code&gt;), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead." onmousemove="i18n(this)">&Vcy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy;&khcy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yucy;&shchcy;&icy;&khcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; (&vcy;&kcy;&lcy;&yucy;&chcy;&acy;&yacy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ucy;&yucy;  <code>ort</code>  ), &iecy;&scy;&lcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&iecy; &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ocy; &vcy; &ocy;&bcy;&iecy; &vcy;&iecy;&tcy;&vcy;&icy;, &ncy;&ocy; &pcy;&ocy;&zcy;&zhcy;&iecy; &ocy;&tcy;&mcy;&iecy;&ncy;&iecy;&ncy;&ocy; &vcy; &ocy;&dcy;&ncy;&ocy;&jcy; &icy;&zcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;, &ecy;&tcy;&ocy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &pcy;&rcy;&icy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&ocy;&mcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&iecy;; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &lcy;&yucy;&dcy;&iecy;&jcy; &tcy;&acy;&kcy;&ocy;&iecy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&iecy; &scy;&bcy;&icy;&vcy;&acy;&iecy;&tcy; &scy; &tcy;&ocy;&lcy;&kcy;&ucy;. &Ecy;&tcy;&ocy; &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&dcy;&icy;&tcy; &pcy;&ocy;&tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &pcy;&rcy;&icy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &ucy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&yucy;&tcy;&scy;&yacy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &gcy;&ocy;&lcy;&ocy;&vcy;&ycy; &icy; &bcy;&acy;&zcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &acy; &ncy;&iecy; &ocy;&tcy;&dcy;&iecy;&lcy;&softcy;&ncy;&ycy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;. &Pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy;&chcy;&icy;&tcy;&acy;&iecy;&tcy; &ocy;&tcy;&mcy;&iecy;&ncy;&iecy;&ncy;&ncy;&ocy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&iecy; &vcy;&ocy;&ocy;&bcy;&shchcy;&iecy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&icy;&iecy;&mcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &icy; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &zcy;&acy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&ncy;&ucy;&yucy; &vcy;&iecy;&rcy;&scy;&icy;&yucy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_configuration"><span data-i18n="b332c3492d5eb10a118eb6d8b0dcd689bc2477ce2ae16b303753b942b54377bc/aa" data-source="Configuration" onmousemove="i18n(this)">Configuration</span></h2> <div> <div> <dl> <dt id="Documentation/git-merge.txt-branchltnamegtmergeOptions"><span data-i18n="87a10365872f3ee9047558c86ddaf454ad123c87300838ca6ccd786f68dd6a66/4d" data-source="branch.&amp;lt;name&amp;gt;.mergeOptions" onmousemove="i18n(this)">branch.&lt;name&gt;.mergeOptions</span></dt> <dd> <p><span data-i18n="73bc25573121467aebd62dd571910c76e7456e6ff7cb8091ccd64283cbbc1722/5d" data-source="Sets default options for merging into branch &amp;lt;name&amp;gt;. The syntax and supported options are the same as those of &lt;code&gt;git merge&lt;/code&gt;, but option values containing whitespace characters are currently not supported." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &dcy;&lcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy; &vcy;&iecy;&tcy;&kcy;&ocy;&jcy; &lt;&icy;&mcy;&yacy;&gt;. &Scy;&icy;&ncy;&tcy;&acy;&kcy;&scy;&icy;&scy; &icy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&mcy;&ycy;&iecy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy; &tcy;&acy;&kcy;&icy;&iecy; &zhcy;&iecy;, &kcy;&acy;&kcy; &ucy;  <code>git merge</code> , &ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ocy;&vcy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&icy;&iecy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ycy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy;, &vcy; &ncy;&acy;&scy;&tcy;&ocy;&yacy;&shchcy;&iecy;&iecy; &vcy;&rcy;&iecy;&mcy;&yacy; &ncy;&iecy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&yucy;&tcy;&scy;&yacy;.</span></p> </dd> </dl> </div> <p><span data-i18n="a0fa656f09c40af871f0a58caeea15390872ffb9b4e2037c00ece4df3c0023ad/b5" data-source="Everything above this line in this section isn&amp;rsquo;t included from the &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt; documentation. The content that follows is the same as what&amp;rsquo;s found there:" onmousemove="i18n(this)">&Vcy;&scy;&iecy;, &chcy;&tcy;&ocy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &vcy;&ycy;&shcy;&iecy; &ecy;&tcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;, &ncy;&iecy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &vcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&yucy;  <a href="git-config.html">git-config[1]</a> . &Scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &tcy;&acy;&kcy;&ocy;&iecy; &zhcy;&iecy;, &kcy;&acy;&kcy; &icy; &ncy;&acy;&jcy;&dcy;&iecy;&ncy;&ncy;&ocy;&iecy; &tcy;&acy;&mcy;:</span></p> <div> <dl> <dt id="Documentation/git-merge.txt-mergeconflictStyle"><span data-i18n="1d593264809bdcd26c55ffe066f7c03c1c62661742223d7590092e32725aef14/a5" data-source="merge.conflictStyle" onmousemove="i18n(this)">merge.conflictStyle</span></dt> <dd> <p><span data-i18n="03958819c9ebd1168e9e4e08eabf8ac4f6588c03c16e002f4faf60f484e54ca7/e3" data-source="Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is &amp;quot;merge&amp;quot;, which shows a &lt;code&gt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&lt;/code&gt; conflict marker, changes made by one side, a &lt;code&gt;=======&lt;/code&gt; marker, changes made by the other side, and then a &lt;code&gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&lt;/code&gt; marker. An alternate style, &amp;quot;diff3&amp;quot;, adds a &lt;code&gt;|||||||&lt;/code&gt; marker and the original text before the &lt;code&gt;=======&lt;/code&gt; marker. The &amp;quot;merge&amp;quot; style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides, they are just pulled out of the conflict region. Another alternate style, &amp;quot;zdiff3&amp;quot;, is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region." onmousemove="i18n(this)">&Ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &scy;&tcy;&icy;&lcy;&softcy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&iecy; &fcy;&rcy;&acy;&gcy;&mcy;&iecy;&ncy;&tcy;&ycy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&yucy;&tcy;&scy;&yacy; &vcy; &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &pcy;&rcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;  &quot;merge&quot; , &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;  <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> , &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ncy;&ycy;&iecy; &ocy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ocy;&jcy;, &mcy;&acy;&rcy;&kcy;&iecy;&rcy;  <code>=======</code> , &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ncy;&ycy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ocy;&jcy;, &acy; &zcy;&acy;&tcy;&iecy;&mcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;  <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code> . &Acy;&lcy;&softcy;&tcy;&iecy;&rcy;&ncy;&acy;&tcy;&icy;&vcy;&ncy;&ycy;&jcy; &scy;&tcy;&icy;&lcy;&softcy;  &quot;diff3&quot;  &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;  <code>|||||||</code>  &icy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ycy;&jcy; &tcy;&iecy;&kcy;&scy;&tcy; &pcy;&iecy;&rcy;&iecy;&dcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ocy;&mcy;  <code>=======</code> . &Scy;&tcy;&icy;&lcy;&softcy;  &quot;merge&quot;  &icy;&mcy;&iecy;&iecy;&tcy; &tcy;&iecy;&ncy;&dcy;&iecy;&ncy;&tscy;&icy;&yucy; &scy;&ocy;&zcy;&dcy;&acy;&vcy;&acy;&tcy;&softcy; &mcy;&iecy;&ncy;&softcy;&shcy;&icy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ycy;&iecy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&icy;, &chcy;&iecy;&mcy; diff3, &kcy;&acy;&kcy; &icy;&zcy;-&zcy;&acy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &tcy;&iecy;&kcy;&scy;&tcy;&acy;, &tcy;&acy;&kcy; &icy; &pcy;&ocy;&tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &kcy;&ocy;&gcy;&dcy;&acy; &pcy;&ocy;&dcy;&mcy;&ncy;&ocy;&zhcy;&iecy;&scy;&tcy;&vcy;&ocy; &scy;&tcy;&rcy;&ocy;&kcy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&iecy;&tcy; &scy; &dcy;&vcy;&ucy;&khcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;, &ocy;&ncy;&icy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &vcy;&ycy;&tcy;&yacy;&gcy;&icy;&vcy;&acy;&yucy;&tcy;&scy;&yacy; &icy;&zcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&jcy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&icy;. &Dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &acy;&lcy;&softcy;&tcy;&iecy;&rcy;&ncy;&acy;&tcy;&icy;&vcy;&ncy;&ycy;&jcy; &scy;&tcy;&icy;&lcy;&softcy;,  &quot;zdiff3&quot; , &pcy;&ocy;&khcy;&ocy;&zhcy; &ncy;&acy; diff3, &ncy;&ocy; &ucy;&dcy;&acy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&yucy;&shchcy;&icy;&iecy; &lcy;&icy;&ncy;&icy;&icy; &scy; &dcy;&vcy;&ucy;&khcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&jcy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&icy;, &kcy;&ocy;&gcy;&dcy;&acy; &ecy;&tcy;&icy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&yucy;&shchcy;&icy;&iecy; &lcy;&icy;&ncy;&icy;&icy; &pcy;&ocy;&yacy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &lcy;&icy;&bcy;&ocy; &vcy; &ncy;&acy;&chcy;&acy;&lcy;&iecy;, &lcy;&icy;&bcy;&ocy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&jcy; &ocy;&bcy;&lcy;&acy;&scy;&tcy;&icy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergedefaultToUpstream"><span data-i18n="928a5b6bd8076c718ee350c7d02689c70af34aebf18120a61f0cd9d130d0be2c/93" data-source="merge.defaultToUpstream" onmousemove="i18n(this)">merge.defaultToUpstream</span></dt> <dd> <p><span data-i18n="ddc8fed224f17ef283756adfa8239e6b8e8add3656b9cb2acf5c70a3ccd9497d/55" data-source="If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the &lt;code&gt;branch.&amp;lt;current branch&amp;gt;.merge&lt;/code&gt; that name the branches at the remote named by &lt;code&gt;branch.&amp;lt;current branch&amp;gt;.remote&lt;/code&gt; are consulted, and then they are mapped via &lt;code&gt;remote.&amp;lt;remote&amp;gt;.fetch&lt;/code&gt; to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &bcy;&iecy;&zcy; &kcy;&acy;&kcy;&ocy;&gcy;&ocy;-&lcy;&icy;&bcy;&ocy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&iecy; &vcy;&ocy;&scy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy;, &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &dcy;&lcy;&yacy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &icy;&khcy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&iecy; &ncy;&acy;&bcy;&lcy;&yucy;&dcy;&acy;&iecy;&mcy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;, &khcy;&rcy;&acy;&ncy;&yacy;&shchcy;&icy;&iecy;&scy;&yacy; &vcy; &icy;&khcy; &vcy;&iecy;&tcy;&vcy;&yacy;&khcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy;. &Zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;  <code>branch.&lt;current branch&gt;.merge</code> , &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&acy;&zcy;&ycy;&vcy;&acy;&yucy;&tcy; &vcy;&iecy;&tcy;&kcy;&icy; &ncy;&acy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ocy;&mcy; &kcy;&ocy;&mcy;&pcy;&softcy;&yucy;&tcy;&iecy;&rcy;&iecy;, &ncy;&acy;&zcy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy;  <code>branch.&lt;current branch&gt;.remote</code> , &acy;&ncy;&acy;&lcy;&icy;&zcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy;, &acy; &zcy;&acy;&tcy;&iecy;&mcy; &ocy;&ncy;&icy; &scy;&ocy;&pcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &chcy;&iecy;&rcy;&iecy;&zcy;  <code>remote.&lt;remote&gt;.fetch</code>  &scy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&mcy;&icy; &vcy;&iecy;&tcy;&vcy;&yacy;&mcy;&icy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy;, &acy; &kcy;&ocy;&ncy;&chcy;&icy;&kcy;&icy; &ecy;&tcy;&icy;&khcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&yucy;&tcy;&scy;&yacy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&tcy;&icy;&ncy;&ncy;&ocy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergeff"><span data-i18n="0b1aff6fb0e33d8c78ad955052884a2f3d89482f741cacd7affd54b167d84264/27" data-source="merge.ff" onmousemove="i18n(this)">merge.ff</span></dt> <dd> <p><span data-i18n="3257ba7900cbbd3afe3f46785c3c41ded88f58e67a25e4302e9f06477210a988/81" data-source="By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to &lt;code&gt;false&lt;/code&gt;, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the &lt;code&gt;--no-ff&lt;/code&gt; option from the command line). When set to &lt;code&gt;only&lt;/code&gt;, only such fast-forward merges are allowed (equivalent to giving the &lt;code&gt;--ff-only&lt;/code&gt; option from the command line)." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  Git  &ncy;&iecy; &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&rcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy;&tcy;&ocy;&mcy;&kcy;&ocy;&mcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;. &Vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &kcy;&ocy;&ncy;&chcy;&icy;&kcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy;&pcy;&iecy;&rcy;&iecy;&dcy;. &IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>false</code>  , &ecy;&tcy;&acy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &scy;&ocy;&ocy;&bcy;&shchcy;&acy;&iecy;&tcy;  Git  &ocy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yacy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy; &tcy;&acy;&kcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; (&ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yucy; &ocy;&pcy;&tscy;&icy;&icy;  <code>--no-ff</code>  &icy;&zcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;). &IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>only</code>  , &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&ycy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &tcy;&acy;&kcy;&icy;&iecy; &bcy;&ycy;&scy;&tcy;&rcy;&ycy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; (&ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yucy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy;  <code>--ff-only</code>  &icy;&zcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;).</span></p> </dd> <dt id="Documentation/git-merge.txt-mergeverifySignatures"><span data-i18n="d2f445170747289672ba03cb6ec32131fc4d5643be201a44b1408c95f359bb35/75" data-source="merge.verifySignatures" onmousemove="i18n(this)">merge.verifySignatures</span></dt> <dd> <p><span data-i18n="dc5b99f4b1b5e40c3026f8890474abc955e6c7ab78892b152041d094836f9f59/6b" data-source="If true, this is equivalent to the --verify-signatures command line option. See &lt;a href=&quot;git-merge&quot;&gt;git-merge[1]&lt;/a&gt; for details." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy; &pcy;&rcy;&acy;&vcy;&dcy;&acy;, &ecy;&tcy;&ocy; &ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ocy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; --verify-signatures. &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy;  <a href="git-merge.html">git-merge[1]</a> .</span></p> </dd> <dt id="Documentation/git-merge.txt-mergebranchdesc"><span data-i18n="4d4872beaaad1faa6da60f09bf09c5ebbbdee9af008b5634c7d90d60b268fc7f/4b" data-source="merge.branchdesc" onmousemove="i18n(this)">merge.branchdesc</span></dt> <dd> <p><span data-i18n="ebd2fb43de252e7229be57ed8b35bc8e45c2edc51dcc240fbb3e69751783a281/7c" data-source="In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false." onmousemove="i18n(this)">&Pcy;&ocy;&mcy;&icy;&mcy;&ocy; &icy;&mcy;&iecy;&ncy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;, &zcy;&acy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&mcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&icy;&yacy; &vcy;&iecy;&tcy;&kcy;&icy;, &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ncy;&ycy;&mcy; &scy; &ncy;&icy;&mcy;&icy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &lcy;&ocy;&zhcy;&softcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergelog"><span data-i18n="5c6fd68be7c821fffe242b5a2960fa2750000c891653807c60c701127ede07e4/0b" data-source="merge.log" onmousemove="i18n(this)">merge.log</span></dt> <dd> <p><span data-i18n="5cca3581d2ce451454a95bd0666711ca029b2f7c1bfce0ced6d55cfae0fded4f/26" data-source="In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20." onmousemove="i18n(this)">&Pcy;&ocy;&mcy;&icy;&mcy;&ocy; &icy;&mcy;&iecy;&ncy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;, &zcy;&acy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &ncy;&iecy; &bcy;&ocy;&lcy;&iecy;&iecy; &chcy;&iecy;&mcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ycy;&mcy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&ocy;&mcy; &ocy;&dcy;&ncy;&ocy;&scy;&tcy;&rcy;&ocy;&chcy;&ncy;&ycy;&khcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&icy;&jcy; &icy;&zcy; &fcy;&acy;&kcy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&yucy;&tcy;&scy;&yacy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; false, &acy;  true  &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &scy;&icy;&ncy;&ocy;&ncy;&icy;&mcy;&ocy;&mcy; 20.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergesuppressDest"><span data-i18n="ea94e0cded4e0501511ed61fae206d837a1cadfc03bea11e3c07fec72cb0204d/08" data-source="merge.suppressDest" onmousemove="i18n(this)">merge.suppressDest</span></dt> <dd> <p><span data-i18n="4fad8db59d32a712321ed39e6aa2f5d28879fa0191cf0c43452af89fbbaf0d25/09" data-source="By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit &amp;quot;into &amp;lt;branch name&amp;gt;&amp;quot; from its title." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&icy; glob, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &icy;&mcy;&iecy;&ncy;&acy;&mcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;, &kcy; &ecy;&tcy;&ocy;&jcy; &mcy;&ncy;&ocy;&gcy;&ocy;&zcy;&ncy;&acy;&chcy;&ncy;&ocy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;, &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;, &vcy;&ycy;&chcy;&icy;&scy;&lcy;&yacy;&iecy;&mcy;&ocy;&iecy; &dcy;&lcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy; &scy; &ecy;&tcy;&icy;&mcy;&icy; &vcy;&iecy;&tcy;&vcy;&yacy;&mcy;&icy; &icy;&ncy;&tcy;&iecy;&gcy;&rcy;&acy;&tscy;&icy;&icy;, &bcy;&ucy;&dcy;&iecy;&tcy; &ocy;&pcy;&ucy;&scy;&kcy;&acy;&tcy;&softcy;  &quot;into &lt;branch name&gt;&quot;  &vcy; &scy;&vcy;&ocy;&iecy;&mcy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&iecy;.</span></p> <p><span data-i18n="83013cb1c5c0de4bcdea10c7526440b3834f22b0796abb7dbe08300538358abf/8d" data-source="An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no &lt;code&gt;merge.suppressDest&lt;/code&gt; variable defined, the default value of &lt;code&gt;master&lt;/code&gt; is used for backward compatibility." onmousemove="i18n(this)">&Ecy;&lcy;&iecy;&mcy;&iecy;&ncy;&tcy; &scy; &pcy;&ucy;&scy;&tcy;&ycy;&mcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &ocy;&chcy;&icy;&scy;&tcy;&kcy;&icy; &scy;&pcy;&icy;&scy;&kcy;&acy; glob, &ncy;&acy;&kcy;&ocy;&pcy;&lcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &icy;&zcy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&icy;&khcy; &zcy;&acy;&pcy;&icy;&scy;&iecy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;. &IEcy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy;  <code>merge.suppressDest</code>  &ncy;&iecy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&acy;, &dcy;&lcy;&yacy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;&jcy; &scy;&ocy;&vcy;&mcy;&iecy;&scy;&tcy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>master</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-mergerenameLimit"><span data-i18n="d0f58175d7e1314ade46c37b23ee6b63f3ab656010719c463f895617832b8381/df" data-source="merge.renameLimit" onmousemove="i18n(this)">merge.renameLimit</span></dt> <dd> <p><span data-i18n="851478360c226784a2631060f99d0fcb3d83f5ebeed4c8792edb15099fd783b1/78" data-source="The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off." onmousemove="i18n(this)">&Kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&ocy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &ucy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &pcy;&rcy;&icy; &icy;&scy;&chcy;&iecy;&rcy;&pcy;&ycy;&vcy;&acy;&yucy;&shchcy;&iecy;&jcy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &IEcy;&scy;&lcy;&icy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ocy;, &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; diff.renameLimit. &IEcy;&scy;&lcy;&icy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ycy; &ncy;&icy; merge.renameLimit, &ncy;&icy; diff.renameLimit, &vcy; &ncy;&acy;&scy;&tcy;&ocy;&yacy;&shchcy;&iecy;&iecy; &vcy;&rcy;&iecy;&mcy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; 7000. &Ecy;&tcy;&ocy;&tcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy; &ncy;&iecy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy;, &iecy;&scy;&lcy;&icy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &ocy;&tcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergerenames"><span data-i18n="7e1a557c89cc5a16ec7458ef6db6082e761acd34ce3e75d96e8bf6a2fef4ffb1/e1" data-source="merge.renames" onmousemove="i18n(this)">merge.renames</span></dt> <dd> <p><span data-i18n="6467aa1427439d555a00090fec6d9d9fee739963959f78afa61a3968c936a9b4/68" data-source="Whether Git detects renames. If set to &amp;quot;false&amp;quot;, rename detection is disabled. If set to &amp;quot;true&amp;quot;, basic rename detection is enabled. Defaults to the value of diff.renames." onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &lcy;&icy;  Git  &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;. &IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;false&quot; , &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &ocy;&tcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy;. &IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;true&quot; , &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &bcy;&acy;&zcy;&ocy;&vcy;&ocy;&iecy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; diff.renames.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergedirectoryRenames"><span data-i18n="66a5f2bfe3906164220fc08768993327b7e40a9925e480bda0745321a0f05632/23" data-source="merge.directoryRenames" onmousemove="i18n(this)">merge.directoryRenames</span></dt> <dd> <p><span data-i18n="fd631bade47b8c29f7eac5881f229b4653d33acaf21ee942d78b77023847cd71/15" data-source="Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to &amp;quot;false&amp;quot;, directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to &amp;quot;true&amp;quot;, directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to &amp;quot;conflict&amp;quot;, a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to &amp;quot;conflict&amp;quot;." onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &lcy;&icy;  Git  &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ocy;&vcy;, &vcy;&lcy;&icy;&yacy;&yucy;&shchcy;&iecy;&iecy; &ncy;&acy; &tcy;&ocy;, &chcy;&tcy;&ocy; &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&dcy;&icy;&tcy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy; &ncy;&ocy;&vcy;&ycy;&mcy;&icy; &fcy;&acy;&jcy;&lcy;&acy;&mcy;&icy;, &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy; &vcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy; &ncy;&acy; &ocy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&iecy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;, &kcy;&ocy;&gcy;&dcy;&acy; &ecy;&tcy;&ocy;&tcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy; &bcy;&ycy;&lcy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy; &ncy;&acy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&iecy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;. &IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; merge.directoryRenames &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;false&quot; , &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy; &ocy;&tcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy;, &acy; &ecy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &tcy;&acy;&kcy;&icy;&iecy; &ncy;&ocy;&vcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &ocy;&scy;&tcy;&acy;&ncy;&ucy;&tcy;&scy;&yacy; &vcy; &scy;&tcy;&acy;&rcy;&ocy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy;. &IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;true&quot; , &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy;, &chcy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &tcy;&acy;&kcy;&icy;&iecy; &ncy;&ocy;&vcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &bcy;&ucy;&dcy;&ucy;&tcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&shchcy;&iecy;&ncy;&ycy; &vcy; &ncy;&ocy;&vcy;&ycy;&jcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;. &IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;conflict&quot; , &dcy;&lcy;&yacy; &tcy;&acy;&kcy;&icy;&khcy; &pcy;&ucy;&tcy;&iecy;&jcy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&ocy;&bcy;&shchcy;&acy;&tcy;&softcy;&scy;&yacy; &ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&iecy;. &IEcy;&scy;&lcy;&icy; merge.renames &icy;&mcy;&iecy;&iecy;&tcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; false, merge.directoryRenames &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &icy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; false. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  &quot;conflict&quot; .</span></p> </dd> <dt id="Documentation/git-merge.txt-mergerenormalize"><span data-i18n="995ad4d521a09efad8288c8dfbb90826b17df21337672fdb069f188119c6cf0a/5c" data-source="merge.renormalize" onmousemove="i18n(this)">merge.renormalize</span></dt> <dd> <p><span data-i18n="6d74cf2168d8618ab5f76d6dd909a087cc8888cc7a0bf20861f42a45d37d756e/ad" data-source="Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section &amp;quot;Merging branches with differing checkin/checkout attributes&amp;quot; in &lt;a href=&quot;gitattributes&quot;&gt;gitattributes[5]&lt;/a&gt;." onmousemove="i18n(this)">&Scy;&ocy;&ocy;&bcy;&shchcy;&icy;&tcy;&iecy;  Git , &chcy;&tcy;&ocy; &kcy;&acy;&ncy;&ocy;&ncy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&iecy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &vcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy; &scy;&ocy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&iecy;&mcy; &icy;&zcy;&mcy;&iecy;&ncy;&icy;&lcy;&ocy;&scy;&softcy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &bcy;&ocy;&lcy;&iecy;&iecy; &rcy;&acy;&ncy;&ncy;&icy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&yucy;&tcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &scy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy;&mcy;&icy; &scy;&tcy;&rcy;&ocy;&kcy; CRLF, &ncy;&ocy; &vcy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&khcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yucy;&tcy;&scy;&yacy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; LF). &Vcy; &tcy;&acy;&kcy;&ocy;&mcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy;  Git  &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy;, &zcy;&acy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ycy;&iecy; &vcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&khcy;, &vcy; &kcy;&acy;&ncy;&ocy;&ncy;&icy;&chcy;&iecy;&scy;&kcy;&ucy;&yucy; &fcy;&ocy;&rcy;&mcy;&ucy; &pcy;&iecy;&rcy;&iecy;&dcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&iecy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&mcy;&iecy;&ncy;&softcy;&shcy;&icy;&tcy;&softcy; &ncy;&iecy;&ncy;&ucy;&zhcy;&ncy;&ycy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;. &Dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy; &scy;&mcy;. &vcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;  &quot;Merging branches with differing checkin/checkout attributes&quot;  &vcy;  <a href="gitattributes.html">gitattributes[5]</a> .</span></p> </dd> <dt id="Documentation/git-merge.txt-mergestat"><span data-i18n="d0981d9ef7537c30035ac9d406e6ec2dbf1b2539688e8a22af89cbda2f7cca81/b4" data-source="merge.stat" onmousemove="i18n(this)">merge.stat</span></dt> <dd> <p><span data-i18n="0603db8c5f95080ce9550a29e9f537784e05b04dc6a9c1e24189887a99ae6d0c/af" data-source="Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default." onmousemove="i18n(this)">&Scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &lcy;&icy; &pcy;&iecy;&chcy;&acy;&tcy;&acy;&tcy;&softcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &mcy;&iecy;&zhcy;&dcy;&ucy; ORIG_HEAD &icy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ocy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.  True  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergeautoStash"><span data-i18n="6e87610f289966a73a0526381a423be09d37ec9155689a33c5e432d068d3f23b/bb" data-source="merge.autoStash" onmousemove="i18n(this)">merge.autoStash</span></dt> <dd> <p><span data-i18n="a720da4662820a689ea93a8bffbd6c8b521123cf55110c9faae004ef80bacd3e/63" data-source="When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the &lt;code&gt;--no-autostash&lt;/code&gt; and &lt;code&gt;--autostash&lt;/code&gt; options of &lt;a href=&quot;git-merge&quot;&gt;git-merge[1]&lt;/a&gt;. Defaults to false." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; true, &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &zcy;&acy;&pcy;&icy;&scy;&softcy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &tcy;&acy;&jcy;&ncy;&icy;&kcy;&acy; &pcy;&iecy;&rcy;&iecy;&dcy; &ncy;&acy;&chcy;&acy;&lcy;&ocy;&mcy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy; &icy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &iecy;&iecy; &pcy;&ocy;&scy;&lcy;&iecy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy;. &Ecy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&acy; &laquo;&gcy;&rcy;&yacy;&zcy;&ncy;&ocy;&mcy;&raquo; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &scy; &ocy;&scy;&tcy;&ocy;&rcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy;&yucy;: &fcy;&icy;&ncy;&acy;&lcy;&softcy;&ncy;&ocy;&iecy; &pcy;&rcy;&icy;&lcy;&ocy;&zhcy;&iecy;&ncy;&icy;&iecy; stash &pcy;&ocy;&scy;&lcy;&iecy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&rcy;&icy;&vcy;&iecy;&scy;&tcy;&icy; &kcy; &ncy;&iecy;&tcy;&rcy;&icy;&vcy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&mcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&mcy;. &Ecy;&tcy;&ucy; &ocy;&pcy;&tscy;&icy;&yucy; &mcy;&ocy;&zhcy;&ncy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &ocy;&pcy;&tscy;&icy;&yacy;&mcy;&icy;  <code>--no-autostash</code>  &icy;  <code>--autostash</code>  &dcy;&lcy;&yacy;  <a href="git-merge.html">git-merge[1]</a> . &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &lcy;&ocy;&zhcy;&softcy;.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergetool"><span data-i18n="51ae391c2e3cd9f9069358c8465865bc6703a58548b3ede371b54890e3d598a8/7e" data-source="merge.tool" onmousemove="i18n(this)">merge.tool</span></dt> <dd> <p><span data-i18n="9c053c13cab7959b00d4e804a7dc91dc34a642ccf96a44204c157d64e3d215c7/1e" data-source="Controls which merge tool is used by &lt;a href=&quot;git-mergetool&quot;&gt;git-mergetool[1]&lt;/a&gt;. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.&amp;lt;tool&amp;gt;.cmd variable is defined." onmousemove="i18n(this)">&Ucy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &tcy;&iecy;&mcy;, &kcy;&acy;&kcy;&ocy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;  <a href="git-mergetool.html">git-mergetool[1]</a> . &Vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &ncy;&icy;&zhcy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&ncy;&ycy; &dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&iecy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;. &Lcy;&yucy;&bcy;&ocy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; mergetool.&lt;tool&gt;.cmd.</span></p> </dd> <dt id="Documentation/git-merge.txt-mergeguitool"><span data-i18n="4caf4904caae792e28b06f203fd3448e5afb53de615a49a3172dd9b4e81b7deb/e6" data-source="merge.guitool" onmousemove="i18n(this)">merge.guitool</span></dt> <dd> <p><span data-i18n="7ebc871163f8370e9f2ab4596f0a40205efc633d0b85bb00100de3a5d2eae4e0/23" data-source="Controls which merge tool is used by &lt;a href=&quot;git-mergetool&quot;&gt;git-mergetool[1]&lt;/a&gt; when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.&amp;lt;guitool&amp;gt;.cmd variable is defined." onmousemove="i18n(this)">&Ucy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &tcy;&iecy;&mcy;, &kcy;&acy;&kcy;&ocy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;  <a href="git-mergetool.html">git-mergetool[1]</a> , &iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy; &fcy;&lcy;&acy;&gcy; -g/--gui. &Vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &ncy;&icy;&zhcy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&ncy;&ycy; &dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&iecy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;. &Lcy;&yucy;&bcy;&ocy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &tcy;&rcy;&iecy;&bcy;&ucy;&iecy;&tcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; mergetool.&lt;guitool&gt;.cmd.</span></p> <div> <ul> <li> <p><span data-i18n="27cb9cd05417bc6d128cb835b4b25ce397ad7fbcab22426a4b6631b88b5834bb/93" data-source="araxis" onmousemove="i18n(this)">araxis</span></p> </li> <li> <p><span data-i18n="1e0bbd6c686ba050b8eb03ffeedc64fdc9d80947fce821abbe5d6dc8d252c5ac/7d" data-source="bc" onmousemove="i18n(this)">bc</span></p> </li> <li> <p><span data-i18n="235a8d520e795c5c6da5399689932fce95e6c18db3d5b3120fcf20b9d1839432/c4" data-source="codecompare" onmousemove="i18n(this)">codecompare</span></p> </li> <li> <p><span data-i18n="a0449ab88d413f3b14c796a356bd9e8f4c19e4c6071ca9ab5f683c0bf32ffea0/3f" data-source="deltawalker" onmousemove="i18n(this)">deltawalker</span></p> </li> <li> <p><span data-i18n="bfac8a81700d8b0caba161e68e6e0bd162016d4538901e8b3e3245067bad252a/cd" data-source="diffmerge" onmousemove="i18n(this)">diffmerge</span></p> </li> <li> <p><span data-i18n="7a216d41189cdcaa930c5b6cbab6bcb7abce52e32ba532c52e9e500f7130fa9e/34" data-source="diffuse" onmousemove="i18n(this)">diffuse</span></p> </li> <li> <p><span data-i18n="4ad380dda4002e819e5223397cd50a2bc33b0e127ef16fa869b91d5b31835250/52" data-source="ecmerge" onmousemove="i18n(this)">ecmerge</span></p> </li> <li> <p><span data-i18n="15275743f9d383469da72ab33caa1149f9ea6e0f23e258259cd84854baf7ad08/c0" data-source="emerge" onmousemove="i18n(this)">emerge</span></p> </li> <li> <p><span data-i18n="f283c1ba896de3f7b01f03c1018a98ab0428b923ef9f687b9b7e1b1bbf16534f/01" data-source="examdiff" onmousemove="i18n(this)">examdiff</span></p> </li> <li> <p><span data-i18n="9923ac9903bf53c9546555a90cb74026d7abfadba10ed030d1743c4b68a46c69/c3" data-source="guiffy" onmousemove="i18n(this)">guiffy</span></p> </li> <li> <p><span data-i18n="132aa9eeca84a7b9120498b49b0b931193e1e20638e1361076344c4aeb16e99b/37" data-source="gvimdiff" onmousemove="i18n(this)">gvimdiff</span></p> </li> <li> <p><span data-i18n="ae2a0fd74e995dcb85a1f60f2c143981dda8eb08510caca54b2fd1461079c60e/ed" data-source="kdiff3" onmousemove="i18n(this)">kdiff3</span></p> </li> <li> <p><span data-i18n="cfe6a6676d638dfdd7bf0966b975f991224e8ee30b29f8b5bc3de7c0ff48c03c/ce" data-source="meld" onmousemove="i18n(this)">meld</span></p> </li> <li> <p><span data-i18n="eed4f590be41e982c3d222c72786a6c879172c1c68042162a29e17c1efacc473/42" data-source="nvimdiff" onmousemove="i18n(this)">nvimdiff</span></p> </li> <li> <p><span data-i18n="4de46349ddfdac9c069f4411c92131bb79ae61db2d79e984e5c42365194bf4a7/af" data-source="opendiff" onmousemove="i18n(this)">opendiff</span></p> </li> <li> <p><span data-i18n="615d5723bc9020a1cd28ed1eb8e70ea7b30066f112c21f31e430b2a791c8723d/02" data-source="p4merge" onmousemove="i18n(this)">p4merge</span></p> </li> <li> <p><span data-i18n="7aadbbc64a7e8eda7c785927085d0afdc612447055c135f970617d4f3e545df0/40" data-source="smerge" onmousemove="i18n(this)">smerge</span></p> </li> <li> <p><span data-i18n="ef27d7ee9ddf95f6fbb8a2cc4c5276ee2812c64de47a7edcf05d0717209994a4/51" data-source="tkdiff" onmousemove="i18n(this)">tkdiff</span></p> </li> <li> <p><span data-i18n="b50f408edb4b51e08444c2bb3a2cf5b418652d2d06a832050d8745eb25831558/3e" data-source="tortoisemerge" onmousemove="i18n(this)">tortoisemerge</span></p> </li> <li> <p><span data-i18n="40baf55746dea9a755e4292187065554679f6141ffadf406a6682d166bd94dad/54" data-source="vimdiff" onmousemove="i18n(this)">vimdiff</span></p> </li> <li> <p><span data-i18n="bf057d71f944bc4f8ac0a7378082445426f61e74311a399bf68eb0a34cfd17da/a6" data-source="winmerge" onmousemove="i18n(this)">winmerge</span></p> </li> <li> <p><span data-i18n="246866e36cb450f86cf288a48017123a6d75aa8d82672f682a1dbbdfde798d52/4a" data-source="xxdiff" onmousemove="i18n(this)">xxdiff</span></p> </li> </ul> </div> </dd> <dt id="Documentation/git-merge.txt-mergeverbosity"><span data-i18n="090da335c4bbbbb25abfb8354dfa9d99e7ae56a387f7975ee4123a279412fd4e/8e" data-source="merge.verbosity" onmousemove="i18n(this)">merge.verbosity</span></dt> <dd> <p><span data-i18n="4ab88bd53bbedd517e1da1810a4fe6a5e88b79153ace0d368a011fbf2ce1efe5/f6" data-source="Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the &lt;code&gt;GIT_MERGE_VERBOSITY&lt;/code&gt; environment variable." onmousemove="i18n(this)">&Ucy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &ocy;&bcy;&hardcy;&iecy;&mcy;&ocy;&mcy; &vcy;&ycy;&vcy;&ocy;&dcy;&acy;, &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&iecy;&mcy;&ocy;&gcy;&ocy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&iecy;&jcy; &rcy;&iecy;&kcy;&ucy;&rcy;&scy;&icy;&vcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy; 0 &ncy;&iecy; &vcy;&ycy;&vcy;&ocy;&dcy;&icy;&tcy; &ncy;&icy;&chcy;&iecy;&gcy;&ocy;, &kcy;&rcy;&ocy;&mcy;&iecy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ocy;&bcy; &ocy;&shcy;&icy;&bcy;&kcy;&iecy;, &iecy;&scy;&lcy;&icy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;. &Ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy; 1 &vcy;&ycy;&vcy;&ocy;&dcy;&icy;&tcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;, 2 &vcy;&ycy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;. &Ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy; 5 &icy; &vcy;&ycy;&shcy;&iecy; &vcy;&ycy;&vcy;&ocy;&dcy;&icy;&tcy; &ocy;&tcy;&lcy;&acy;&dcy;&ocy;&chcy;&ncy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy; 2. &Mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &scy;&rcy;&iecy;&dcy;&ycy;  <code>GIT_MERGE_VERBOSITY</code> .</span></p> </dd> <dt id="Documentation/git-merge.txt-mergeltdrivergtname"><span data-i18n="532344def7c6d058b902117e23390586c869dbf8018998d07bb50a099eff3115/2b" data-source="merge.&amp;lt;driver&amp;gt;.name" onmousemove="i18n(this)">merge.&lt;driver&gt;.name</span></dt> <dd> <p><span data-i18n="a41b40aeb765dcac5eedd773efafff5a042538e24713d6e9a40b0d552109b6d0/d2" data-source="Defines a human-readable name for a custom low-level merge driver. See &lt;a href=&quot;gitattributes&quot;&gt;gitattributes[5]&lt;/a&gt; for details." onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &ucy;&dcy;&ocy;&bcy;&ocy;&chcy;&icy;&tcy;&acy;&iecy;&mcy;&ocy;&iecy; &icy;&mcy;&yacy; &dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&ocy;&gcy;&ocy; &ncy;&icy;&zcy;&kcy;&ocy;&ucy;&rcy;&ocy;&vcy;&ncy;&iecy;&vcy;&ocy;&gcy;&ocy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy;  <a href="gitattributes.html">gitattributes[5]</a> .</span></p> </dd> <dt id="Documentation/git-merge.txt-mergeltdrivergtdriver"><span data-i18n="04d5263e9752a0da37cce07d2fdd6dfececdb009e7fefb597a18436d039e10d0/0d" data-source="merge.&amp;lt;driver&amp;gt;.driver" onmousemove="i18n(this)">merge.&lt;driver&gt;.driver</span></dt> <dd> <p><span data-i18n="5e1d5aa26f4fd2fd30a2657a91e3d739838ad0f179fda8ee309b2068bce170a7/6a" data-source="Defines the command that implements a custom low-level merge driver. See &lt;a href=&quot;gitattributes&quot;&gt;gitattributes[5]&lt;/a&gt; for details." onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy;, &rcy;&iecy;&acy;&lcy;&icy;&zcy;&ucy;&yucy;&shchcy;&ucy;&yucy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&jcy; &ncy;&icy;&zcy;&kcy;&ocy;&ucy;&rcy;&ocy;&vcy;&ncy;&iecy;&vcy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy;  <a href="gitattributes.html">gitattributes[5]</a> .</span></p> </dd> <dt id="Documentation/git-merge.txt-mergeltdrivergtrecursive"><span data-i18n="b7cf8d03e07d2fb8cfa6aab22574b7d8bceb06396cc64a06c988134b88f4b28c/8d" data-source="merge.&amp;lt;driver&amp;gt;.recursive" onmousemove="i18n(this)">merge.&lt;driver&gt;.recursive</span></dt> <dd> <p><span data-i18n="ace15c26f0d6950dee307a6d0c05387e070045fa0af0b14bbadf3a65dc64adfb/07" data-source="Names a low-level merge driver to be used when performing an internal merge between common ancestors. See &lt;a href=&quot;gitattributes&quot;&gt;gitattributes[5]&lt;/a&gt; for details." onmousemove="i18n(this)">&Ncy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &ncy;&icy;&zcy;&kcy;&ocy;&ucy;&rcy;&ocy;&vcy;&ncy;&iecy;&vcy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &pcy;&rcy;&icy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&icy; &vcy;&ncy;&ucy;&tcy;&rcy;&iecy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&iecy;&zhcy;&dcy;&ucy; &ocy;&bcy;&shchcy;&icy;&mcy;&icy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;&mcy;&icy;. &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy;  <a href="gitattributes.html">gitattributes[5]</a> .</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="_see_also"><span data-i18n="2fa97693b70fa87b95b2d1bdf9558e4ac65d5e82d145f13a03849c4d9c4957a9/40" data-source="See also" onmousemove="i18n(this)">See also</span></h2> <div> <p><span data-i18n="55bdcfb82f61363d62bd1765f6211ac8d3ae3031060875247622ea53a7e7c70c/bd" data-source="&lt;a href=&quot;git-fmt-merge-msg&quot;&gt;git-fmt-merge-msg[1]&lt;/a&gt;, &lt;a href=&quot;git-pull&quot;&gt;git-pull[1]&lt;/a&gt;, &lt;a href=&quot;gitattributes&quot;&gt;gitattributes[5]&lt;/a&gt;, &lt;a href=&quot;git-reset&quot;&gt;git-reset[1]&lt;/a&gt;, &lt;a href=&quot;git-diff&quot;&gt;git-diff[1]&lt;/a&gt;, &lt;a href=&quot;git-ls-files&quot;&gt;git-ls-files[1]&lt;/a&gt;, &lt;a href=&quot;git-add&quot;&gt;git-add[1]&lt;/a&gt;, &lt;a href=&quot;git-rm&quot;&gt;git-rm[1]&lt;/a&gt;, &lt;a href=&quot;git-mergetool&quot;&gt;git-mergetool[1]&lt;/a&gt;" onmousemove="i18n(this)"><a href="git-fmt-merge-msg.html">git-fmt-merge-msg[1]</a> ,  <a href="git-pull.html">git-pull[1]</a> ,  <a href="gitattributes.html">gitattributes[5]</a> ,  <a href="git-reset.html">git-reset[1]</a> ,  <a href="git-diff.html">git-diff[1]</a> ,  <a href="git-ls-files.html">git-ls-files[1]</a> ,  <a href="git-add.html">git-add[1]</a> ,  <a href="git-rm.html">git-rm[1]</a> ,  <a href="git-mergetool.html">git-mergetool[1]</a></span></p> </div><address>
<p>
    &copy; 2012&ndash;2024 Scott Chacon and others<br/>Licensed under the MIT License.<br/>
<a href="https://git-scm.com/docs/git-merge">https://git-scm.com/docs/git-merge</a>
</p>
</address>                </article>
            </main>

            <br>
            <br>
            <hr>

                               <ins class="adsbygoogle"
        style="display:block"
        data-ad-format="autorelaxed"
        data-ad-client="ca-pub-6424571640879890"
        data-ad-slot="7867651344"></ins>
   <script>
        (adsbygoogle = window.adsbygoogle || []).push({});
   </script>            
        </div>

        <!-- -->

        <div class="col-md-3">
            <br>
            <form action="-index-.html">
                <div class="input-group">
                    <input class="form-control" type="search" name="q" placeholder="Search for Git" required>
                    <button class="btn btn-primary" type="submit">
                        <i class="bi bi-search"></i>
                    </button>
                </div>
            </form>
            <br>

                            <div class="list-group list-group-flush">
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-merge-base.html">
                            git merge-base                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-merge-file.html">
                            git merge-file                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-merge-index.html">
                            git merge-index                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-merge-one-file.html">
                            git merge-one-file                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-merge-tree.html">
                            git merge-tree                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mergetool.html">
                            git mergetool                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mktag.html">
                            git mktag                        </a>
                                    </div>
            
            <br>
            <div class="my-3">
                <ins class="adsbygoogle"
     style="display:block"
     data-ad-client="ca-pub-6424571640879890"
     data-ad-slot="3954319254"
     data-ad-format="auto"
     data-full-width-responsive="true"></ins>
<script>
     (adsbygoogle = window.adsbygoogle || []).push({});
</script>            </div>
            <br>

            
            
        </div>
    </div>
</div>    <!--/sse-->

    <footer>
        <br>
        <div class="container">
            <div class="row">
                <div class="col">
                    <hr>
                    <div class="row">
                        <div class="col-md-10">
                            <ul class="nav">
                                <li class="nav-item">
                                    <a class="nav-link ps-0" href="https://runebook.dev/">Help us Improve Translation</a>
                                </li>
                                                            </ul>
                        </div>
                        <div class="col-md-2 text-end">
                            <a href="git-merge.html#" class="fs-5" aria-label="Top">
                                <i class="bi bi-arrow-up-square-fill"></i>
                            </a>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <br>
    </footer>
    <script src="../../../runebook.js"></script>
</body>

</html>